Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 17594) +++ /applications/editors/josm/i18n/po/ar.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-18 14:24+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 13:30+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,8 +17,8 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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" @@ -26,5 +26,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 @@ -33,18 +33,20 @@ msgstr "المساعدة" -#: ../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 "" -#: ../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 @@ -60,8 +62,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 @@ -75,6 +77,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 @@ -84,5 +86,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 @@ -102,58 +104,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 "خطأ" -#: ../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] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -msgstr[1] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -msgstr[2] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -msgstr[3] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -msgstr[4] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -msgstr[5] "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "التغييرات غير المحفوظة" -#: ../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 "حفظ و خروج" -#: ../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 "تجاهل و خروج" -#: ../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 @@ -162,11 +157,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 @@ -180,20 +176,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 "إلغاء" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{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 @@ -210,16 +206,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 @@ -249,12 +245,14 @@ msgstr "التحذير" -#: ../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 "تجاهل عنوان الملف المشوه : \"{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}" @@ -344,5 +342,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 "إضافات" @@ -473,9 +471,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 @@ -509,6 +507,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 @@ -527,11 +525,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 "المعلومات" @@ -553,5 +551,5 @@ msgstr "الرجاء إختيار على الأقل ثلاثة عقد." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -560,10 +558,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -572,5 +570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -579,9 +577,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -636,26 +634,22 @@ msgstr "لا تناقضات للتكبير عليها" -#: ../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 "ادمج الطريق" -#: ../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 "ادمج عدة طرق في طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "الرجاء إختر على الأقل طريقتين للدمج." - -#: ../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 "ادمج الطرقات رغم إختلاف عضويتها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "على أي حال ادمج" -#: ../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 " @@ -663,13 +657,13 @@ msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "غيّر الإتجاه ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "أعكس ثم إدمج" -#: ../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 " @@ -677,30 +671,18 @@ msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" -#: ../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 "ادخل القيم لكل التناقضات." - -#: ../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 "حلل التناقضات" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "ادمج {0} طرقات" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "كل الطرقات كانت فارغة" - -#: ../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 "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "ادمج {0} طرقات" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "الرجاء إختر على الأقل طريقتين للدمج." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -754,5 +736,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 "أحذف" @@ -762,15 +744,15 @@ msgstr "امحي الأغراض المختارة." -#: ../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 "الكتابة فوقه" -#: ../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 "الملف موجود. الكتابة عليه ؟" @@ -799,10 +781,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}" @@ -833,5 +815,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 @@ -874,7 +856,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "حصص سكنية" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1009,1043 +990,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 "إدمج العقد" -#: ../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 "" -#: ../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 "الرجاء إختيار على الأقل عقدتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "دمج العقد رغم عضويتها المختلفة ؟" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "ادمجعلى كلّ حال" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "إدمج {0} عقد" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "إلى أعلى" - -#: ../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 "حرّك الأغراض {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "إلى أسفل" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "إلى اليسار" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "إلى اليمين" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "حرذك {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "حرّك الأغراض {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 "غير قادر على تحريك الأغراض إلى خارج الدنيا" - -#: ../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 "جديد" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "أنشئ خريطة جديدة." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "إفتح..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "إفتح ملف." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "إفتح ملف." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "دور غير معروف ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "إفتح الموقع..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "إفتح URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "أدخل الــ URL للتنزيل:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "موقع التنزيل" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL التنزيل" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "مسموح فقط عقدتين" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "يجب أن يتكون الخيار من طرقات فقط." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../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 "عقدة واحدة محددة فقط" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "إسقاط عمودي" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "ألصِق" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "التفضيلات..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "التفضيلات" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "كرّر" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "غيّر إسم الطبقة" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "و غير إسم الملف" - -#: ../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 "أعكس إتجاه الطرقات" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "أعكس إتجاه كل الطرقات المختارة." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "الرجاء إختيار على الأقل طريق واحدة." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "أعكس إتجاه الطرقات" - -#: ../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 "إحفَظ" - -#: ../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 "إحفظ المعطيات الحالية." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../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 "مستند فارغ" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "لا يحتوي المستند على أي معطيات." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "رغم ذلك احفظه" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "التناقضات" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "إحفظ ملف أو.أس.أم" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "إحفظ ملف GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "" - -#: ../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 "إحفظ كــ ..." - -#: ../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 "إحفظ المعطيات الحالية في ملف جديد." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "إختر الكلّ" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "أعرض تقرير عن الحالة" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "المساعدة: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "تقرير عن الحالة" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "" - -#: ../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 "اغلق" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "" - -#: ../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] "إنّ العقدة المختارة ليست موجودة في وسط أي طريق." -msgstr[1] "إنّ العقدتين المختارة ليست موجودة في وسط أي طريق." -msgstr[2] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." -msgstr[3] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." -msgstr[4] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." -msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." - -#: ../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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق." - -#: ../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] "" -msgstr[1] "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "أقسم الطريق {0} إلى {1} قطع" - -#: ../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 -#, fuzzy -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 -#, fuzzy -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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "إختر أي من :" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "تَراجَع" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "إلغاء التصرف الأخير." - -#: ../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 "إلغاء إختيار الكلّ" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "إلغاء إختيار كلّ الأغراض." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "تحديث المعطيات" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "حمّل إلى أو.أس.أم ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." - -#: ../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 "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "لا يوجد تغييرات للتحميل." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "حمّل هذه التغييرات :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "حمّل التغييرات" - -#: ../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 "إضافة عقدة جديدة إلى طريق موجودة" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "إعدادات الخريطة" - -#: ../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 "الأغراض اللتي يجب إضافتها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "الأغراض اللتي يجب تغييرها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "الأغراض اللتي يجب حذفها:" - -#: ../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] "الأغراض اللتي يجب إضافتها:" -msgstr[1] "الأغراض اللتي يجب إضافتها:" -msgstr[2] "الأغراض اللتي يجب إضافتها:" -msgstr[3] "الأغراض اللتي يجب إضافتها:" -msgstr[4] "الأغراض اللتي يجب إضافتها:" -msgstr[5] "الأغراض اللتي يجب إضافتها:" - -#: ../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] "الأغراض اللتي يجب تغييرها:" -msgstr[1] "الأغراض اللتي يجب تغييرها:" -msgstr[2] "الأغراض اللتي يجب تغييرها:" -msgstr[3] "الأغراض اللتي يجب تغييرها:" -msgstr[4] "الأغراض اللتي يجب تغييرها:" -msgstr[5] "الأغراض اللتي يجب تغييرها:" - -#: ../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] "الأغراض اللتي يجب حذفها:" -msgstr[1] "الأغراض اللتي يجب حذفها:" -msgstr[2] "الأغراض اللتي يجب حذفها:" -msgstr[3] "الأغراض اللتي يجب حذفها:" -msgstr[4] "الأغراض اللتي يجب حذفها:" -msgstr[5] "الأغراض اللتي يجب حذفها:" - -#: ../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 "آخر تغيير في {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "كبّر الرؤية" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "صغّر الرؤية" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "السابق" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "أقفظ رجوعاُ" - -#: ../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 "سمعي: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "أسرع" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "تقدّم سريع" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "مرّر" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "أقفظ إلى الأمام" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "العلامة التالية" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "شغّل العلامة التالية." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "عزف\\مهلة" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "عزف\\مهلة الصوتي" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "العلامة السابقة" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "شغل العلامة السابقة" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "أبطأ" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "تقدّم بطيء" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "جاري تحميل المعطيات" - -#: ../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 "لم يتم تحميل أي معطيات" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "معطيات OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "نزل {0} من {1} (باقية {2} )" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "أخطاء عند التنزيل" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "نمط المحو" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "امحي عقد أو طرقات." - -#: ../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 "النمط: {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 @@ -2056,7 +1019,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 @@ -2065,6 +1029,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 @@ -2095,4 +1059,871 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "إدمج {0} عقد" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "إلى أعلى" + +#: ../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 "حرّك الأغراض {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "إلى أسفل" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "إلى اليسار" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "إلى اليمين" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "حرذك {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "حرّك الأغراض {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 "غير قادر على تحريك الأغراض إلى خارج الدنيا" + +#: ../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 "جديد" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "أنشئ خريطة جديدة." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "إفتح..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "إفتح ملف." + +#: ../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 "إفتح الموقع..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "إفتح URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "أدخل الــ URL للتنزيل:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "موقع التنزيل" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL التنزيل" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "مسموح فقط عقدتين" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "يجب أن يتكون الخيار من طرقات فقط." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" + +#: ../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 "عقدة واحدة محددة فقط" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "إسقاط عمودي" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "ألصِق" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" + +#: ../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 "التفضيلات..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "التفضيلات" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "كرّر" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "غيّر إسم الطبقة" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "و غير إسم الملف" + +#: ../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 "أعكس إتجاه الطرقات" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "أعكس إتجاه كل الطرقات المختارة." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "الرجاء إختيار على الأقل طريق واحدة." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "أعكس إتجاه الطرقات" + +#: ../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 "إحفَظ" + +#: ../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 "إحفظ المعطيات الحالية." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../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 "مستند فارغ" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "رغم ذلك احفظه" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "لا يحتوي المستند على أي معطيات." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "التناقضات" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "إحفظ ملف أو.أس.أم" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "إحفظ ملف GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "" + +#: ../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 "إحفظ كــ ..." + +#: ../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 "إحفظ المعطيات الحالية في ملف جديد." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "إختر الكلّ" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "أعرض تقرير عن الحالة" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "المساعدة: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "تقرير عن الحالة" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../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 "اغلق" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "" + +#: ../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] "إنّ العقدة المختارة ليست موجودة في وسط أي طريق." +msgstr[1] "إنّ العقدتين المختارة ليست موجودة في وسط أي طريق." +msgstr[2] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." +msgstr[3] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." +msgstr[4] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." +msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق." + +#: ../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] "" +msgstr[1] "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "أقسم الطريق {0} إلى {1} قطع" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "إختر أي من :" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "تَراجَع" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "إلغاء التصرف الأخير." + +#: ../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 "إلغاء إختيار الكلّ" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "إلغاء إختيار كلّ الأغراض." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "تحديث المعطيات" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "حمّل إلى أو.أس.أم ..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." + +#: ../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 "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "لا يوجد تغييرات للتحميل." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "كبّر الرؤية" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "صغّر الرؤية" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "السابق" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "أقفظ رجوعاُ" + +#: ../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 "سمعي: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "أسرع" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "تقدّم سريع" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "مرّر" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "أقفظ إلى الأمام" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "العلامة التالية" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "شغّل العلامة التالية." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "عزف\\مهلة" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "عزف\\مهلة الصوتي" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "العلامة السابقة" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "شغل العلامة السابقة" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "أبطأ" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "تقدّم بطيء" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "جاري تحميل المعطيات" + +#: ../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 "لم يتم تحميل أي معطيات" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "معطيات OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "نزل {0} من {1} (باقية {2} )" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "أخطاء عند التنزيل" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "نمط المحو" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "امحي عقد أو طرقات." + +#: ../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 "النمط: {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 @@ -2205,18 +2036,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 "إختر" -#: ../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" @@ -2225,17 +2056,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 "" @@ -2245,5 +2076,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 "" @@ -2358,7 +2189,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - الأغراض المعرفة بلــ ID المحدد" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2409,41 +2239,41 @@ msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "إبدء البحث" -#: ../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 "لم أجد شيء مطابق لِــ ''{0}''" -#: ../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 "وجدتُ {0} مطابقات" -#: ../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 "" @@ -2453,40 +2283,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 "" -#: ../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 "" @@ -2495,5 +2325,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." @@ -2530,7 +2360,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "أضافة عقدة" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2540,52 +2370,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "العلاقات: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "غيّر غرض {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "آخر تغيير في {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "غيّر العلاقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "أحذف \"{0}\" لِــ {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "أحذف \"{0}\" لِــ {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "أحذف \"{0}\" لِــ {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "عيّن {0}={1} لِــ {2} {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "عيّن {0}={1} لِــ {2} {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "عيّن {0}={1} لِــ {2} {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2656,46 +2486,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] "أمحي {0} {1}" -msgstr[1] "أمحي {0} {1}" -msgstr[2] "أمحي {0} {1}" -msgstr[3] "أمحي {0} {1}" -msgstr[4] "أمحي {0} {1}" -msgstr[5] "أمحي {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] "نمط المحو" -msgstr[1] "نمط المحو" -msgstr[2] "نمط المحو" -msgstr[3] "نمط المحو" -msgstr[4] "نمط المحو" -msgstr[5] "نمط المحو" +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] "أمحي {0} {1}" -msgstr[1] "أمحي {0} {1}" -msgstr[2] "أمحي {0} {1}" -msgstr[3] "أمحي {0} {1}" -msgstr[4] "أمحي {0} {1}" -msgstr[5] "أمحي {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] "أمحي من العلاقة" -msgstr[1] "أمحي من العلاقة" -msgstr[2] "أمحي من العلاقة" -msgstr[3] "أمحي من العلاقة" -msgstr[4] "أمحي من العلاقة" -msgstr[5] "أمحي من العلاقة" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2709,20 +2523,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"الخيار \"{0}\" مستعمل من العلاقة \"{1}\" في الدور {2}.\n" -"محو من العلاقة ؟" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"الخيار \"{0}\" مستعمل من العلاقة \"{1}\" في الدور {2}.\n" -"محو من العلاقة ؟" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2733,5 +2543,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." @@ -2809,17 +2619,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2829,17 +2639,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "حلّ {0} التناقضات في {1} أغراض" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3044,5 +2854,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 @@ -3050,23 +2860,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 +#, java-format +msgid "paramete''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../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 "تحذير: {0}" -#: ../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 @@ -3079,11 +2914,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 "" @@ -3134,9 +2974,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." @@ -3145,118 +2985,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 "أمحي العضو ''{0}'' في العلاقة." -#: ../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 "للطريق ''{0}'' أقل من نقطتين." -#: ../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 "دور غير معروف ''{0}''." -#: ../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 "نوع عضو غير معروف لِــ ''{0}''" -#: ../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 "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../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 "النص" @@ -3279,5 +3119,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" @@ -3292,5 +3132,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" @@ -3305,5 +3145,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" @@ -3416,5 +3256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "خط سكة حديد" @@ -3450,127 +3290,33 @@ msgstr[1] "{0} أعضاء" -#: ../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 "مجهول" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "مضيف غير معروف" -#: ../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 "" @@ -3781,5 +3527,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}" @@ -4156,4 +3902,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 @@ -4225,8 +3973,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 @@ -4349,5 +4097,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 "تم حذفه" @@ -4407,5 +4155,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 "" @@ -4447,4 +4195,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 @@ -4458,5 +4207,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 "" @@ -4562,4 +4311,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 "لا تناقضات للتكبير عليها" + +#: ../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 @@ -4572,24 +4357,23 @@ msgstr "الكلّ" -#: ../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 "إختر لون" - -#: ../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}''" @@ -4610,14 +4394,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 "لمّا مفعّل." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4626,12 +4411,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "من الطريق" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "أمحي من العلاقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4663,24 +4446,8 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "علاقة متناقضة" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "حلل التناقضات" - -#: ../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 "ألصِق" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4695,13 +4462,73 @@ #: ../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} طريق" -msgstr[1] "{0} طريقين" -msgstr[2] "{0} طرقات" -msgstr[3] "{0} طريق" -msgstr[4] "{0} طريق" -msgstr[5] "{0} طريق" +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 "أزل العضو في سطر الجدول الحالي من هذه العلاقة" + +#: ../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 "المكان" + +#: ../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 "القيمة" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "مراجعة" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4728,5 +4555,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}" @@ -4757,5 +4584,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." @@ -4828,13 +4655,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 "الطبقة: {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 "العلاقات: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4920,5 +4747,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 "<مختلف>" @@ -4977,5 +4804,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 "أضِف" @@ -5025,5 +4852,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 "العلاقات" @@ -5116,13 +4943,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] "المؤلف" -msgstr[1] "المؤلف" -msgstr[2] "المؤلف" -msgstr[3] "المؤلف" -msgstr[4] "المؤلف" -msgstr[5] "المؤلف" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5135,7 +4958,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "مزيد من المعلومات عن هذه الميزة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5216,5 +5038,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}" @@ -5232,9 +5054,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 "" @@ -5485,11 +5302,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 "" @@ -5503,7 +5320,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "غيّر العلاقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5626,5 +5442,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "الأماكن" @@ -5705,5 +5521,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 "" @@ -5753,7 +5569,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "حمّل التفضيلات الحالية إلى الخادم" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6636,52 +6451,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 "الإسم" @@ -6691,21 +6506,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 "غيّر العلاقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "مزيد من المعلومات عن هذه الميزة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "آخر تغيير في {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6723,7 +6536,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "إسم الشارع" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6764,7 +6576,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "الرجاء إختيار قيمة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6811,11 +6622,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6831,11 +6638,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[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 "" @@ -6852,11 +6655,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6870,7 +6669,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "تجاهل و خروج" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6883,7 +6681,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "حفظ و خروج" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6969,12 +6766,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" + +#: ../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 "الأغراض اللتي يجب إضافتها:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "الأغراض اللتي يجب تغييرها:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "الأغراض اللتي يجب حذفها:" + +#: ../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 "حمّل التغييرات" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "الملفّ" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "حمّل هذه التغييرات :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "أعد التحميل" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "الرجاء إدخال إسم للموقع." + +#: ../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 @@ -7215,5 +7141,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." @@ -7269,7 +7194,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "جاري تحميل المعطيات" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7330,4 +7254,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 "" +"إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون " +"مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7530,5 +7463,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 "" @@ -7980,7 +7913,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "أظهر معرف ID الغرض في لوائح الإختيار" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7995,7 +7927,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "أظهر معرف ID الغرض في لوائح الإختيار" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8347,8 +8278,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!" @@ -8405,5 +8332,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 @@ -8414,42 +8341,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "أضف تعليق" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "أمحي الطبقة المختارة." - -#: ../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 "مزيد من المعلومات عن هذه الميزة" #. 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 "ميزات خيارية:" -#: ../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 "" -#: ../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 "إستعمل التعيينات المسبقة التعريف ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "طريق مغلقة الدوران" -#: ../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 "نوع غير معروف: {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 @@ -8460,15 +8385,15 @@ msgstr "" -#: ../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 "خطأ في التحليل النحوي {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 "العناصر من الفصيلة {0} هي مدعومة" -#: ../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 @@ -8482,18 +8407,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../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 "الخيار فارغ !" -#: ../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 "غيّر الخصائص" @@ -8520,5 +8445,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 "" @@ -8534,7 +8458,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 @@ -8610,5 +8531,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}" @@ -8616,5 +8537,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" @@ -8622,5 +8543,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" @@ -8641,6 +8561,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 @@ -8650,40 +8570,40 @@ msgstr "جاري تنزيل معطيات أو.أس.أم" -#: ../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 " @@ -8745,10 +8665,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 "" @@ -8756,11 +8676,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 "جاري تحضير المعطيات..." - -#: ../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}" @@ -8768,33 +8686,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 -#, java-format -msgid "Reusing existing changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#: ../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 "آخر تغيير في {0}" - -#: ../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 " @@ -8802,44 +8705,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "" -#: ../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 "إتصل بــ {0}..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Leaving changeset {0} open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +#: ../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 "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "جاري الإرسال..." -#: ../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}." @@ -8858,10 +8761,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 "" @@ -8919,6 +8822,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 "ملفات الخادم أو.أس.أم" @@ -8947,5 +8855,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 "" @@ -9002,74 +8910,139 @@ msgstr "خطأ تحليل نحوي" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "نسخة مجهولة" - -#: ../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 +#, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "محوّل من: {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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "لا يوجد لــ أي مرجع" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "" - -#: ../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 "" -#: ../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 "غرض غير مسموح به معروف بــ 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 +#, java-format +msgid "Missing required attribute ''{0}''." msgstr "" #: ../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 "" @@ -9078,16 +9051,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 "حضّر المعطيات أو.أس.أم ..." -#: ../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 "حضّر المعطيات أو.أس.أم ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "جاري تحضير المعطيات..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9132,33 +9119,43 @@ msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت." -#: ../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} باقية. متابعة الإرسال لِــ {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} باقية. متابعة الإرسال لِــ {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} باقية. متابعة الإرسال لِــ {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 "جاري الإرسال..." + +#: ../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 "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9193,11 +9190,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 "" @@ -9210,4 +9202,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 @@ -9247,20 +9244,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 " @@ -9268,5 +9265,9 @@ msgstr "" -#: ../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 "" @@ -9274,19 +9275,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 " @@ -9294,13 +9295,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" @@ -9351,4 +9352,35 @@ msgstr "" +#. 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 "مجهول" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9416,4 +9448,88 @@ msgstr "" +#: ../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 @@ -9480,5 +9596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9487,5 +9603,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9494,5 +9610,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9501,5 +9617,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9508,5 +9624,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9565,40 +9681,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}" @@ -9606,47 +9721,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 "" @@ -9855,5 +9970,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 "" @@ -9867,13 +9982,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 "" @@ -9882,9 +9997,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 "" @@ -9893,65 +10008,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 " @@ -9959,13 +10074,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 "" @@ -10003,5 +10118,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 "" @@ -10048,13 +10163,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" @@ -10063,13 +10178,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 "" @@ -10179,9 +10294,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 "" @@ -10334,7 +10449,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "إختر" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10418,5 +10532,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 "" @@ -11338,18 +11452,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}" @@ -11360,5 +11474,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 " @@ -11366,9 +11480,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 "" @@ -11379,28 +11493,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "انشئ عقدة جديدة" + +#: ../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 " @@ -11409,28 +11528,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 "" @@ -11921,25 +12046,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "ادخل القيم لكل التناقضات." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "حلل التناقضات" + #: ../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 "" @@ -12011,6 +12144,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 "" @@ -12020,10 +12153,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 "" @@ -12110,51 +12243,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 "جاري الإرسال..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12193,18 +12340,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 "" @@ -12212,7 +12359,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 "نسخة مطابقة" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12223,7 +12369,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "امحي عقد أو طرقات." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12788,5 +12933,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12870,5 +13015,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 " @@ -12876,5 +13021,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 "" @@ -12892,17 +13037,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 "" @@ -12943,19 +13088,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "مهجور" - -#: ../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 "" @@ -12966,107 +13110,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:110 +#: ../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 "Please select at least one row to copy." -msgstr "الرجاء إختيار على الأقل طريق واحدة." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" +msgid "Overlap tiles" +msgstr "ملفات الخادم أو.أس.أم" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" msgstr "" @@ -13432,5 +13588,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 "" @@ -13972,7 +14128,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "كوخ" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -13993,8 +14148,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 "إستئجار سيارة" +msgstr "" #. color heath @@ -14012,5 +14166,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 "غابة/حرش" @@ -14023,7 +14178,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "تذاكر_موقف_سيارات" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14059,7 +14213,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "الخيار" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14070,7 +14223,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "غير كامل" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14274,4 +14426,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" @@ -14300,12 +14453,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 @@ -14353,5 +14506,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14388,5 +14541,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14450,6 +14603,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 "" @@ -14595,6 +14749,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 "النوع" @@ -14865,7 +15019,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "المشاة" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14884,7 +15037,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "حواجز" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15176,7 +15328,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 "شركة الإدارة" @@ -15389,6 +15541,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 "إرتفاع" @@ -16300,7 +16452,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" @@ -16348,23 +16497,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 "أزقات الإفتتاح" @@ -16388,5 +16537,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" @@ -16433,22 +16581,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 "" @@ -16463,22 +16611,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 "" @@ -16493,22 +16641,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 "" @@ -16542,5 +16690,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 "الرقم المرجعي" @@ -16573,7 +16721,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "إستيعاب" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16788,5 +16935,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "ملجأ" @@ -17171,7 +17318,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "إشارة وقوف" +msgstr "" #. color tertiary @@ -17214,28 +17360,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "صيني" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "نزّل المساحة" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "ألصِق" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "مدينة" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "محلي/إقليمي" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17263,7 +17404,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "نافورة" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17277,7 +17417,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "مبنى" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17294,13 +17433,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "مراقبة الحدود" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "مبتدئ" +msgstr "" #: build/trans_presets.java:1737 @@ -17317,7 +17454,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "إستعمال الأرض" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17328,19 +17464,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "المعلومات" +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 "وصف الرمز" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "سمعيّ" +msgstr "" #. @@ -17351,7 +17484,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "رقم الهاتف" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17675,5 +17807,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17707,5 +17839,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18831,6 +18963,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 "الديانة" @@ -18839,66 +18971,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 "بوذي" -#: 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 "نصراني" -#: 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 "هندوس" -#: 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 "يهودي" -#: 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 "مسلم" -#: 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 "سيخ" -#: 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 "روحاني" -#: 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 "" -#: 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 "" -#: 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 "الطقوس الدينية" @@ -18907,76 +19039,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 "" -#: 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 "معمداني" -#: 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 "كثليك" -#: 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 "إنجيلي" -#: 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 "شهود يهوه" -#: 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 "لوثري" -#: 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 "منهجي" -#: 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 "" -#: 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 "أرثدكس" -#: 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 "" -#: 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 "" -#: 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 "بروتستاني" -#: 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 "" -#: 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 "شيعي" -#: 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 "سنّي" @@ -19308,5 +19440,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 "الملاحظة" @@ -19331,5 +19463,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 "عملات معدنية" @@ -19337,5 +19469,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 "الملاحظات" @@ -19343,5 +19475,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 "" @@ -19349,5 +19481,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 "" @@ -19355,5 +19487,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 "بطاقات إعتماد" @@ -19412,10 +19544,143 @@ msgstr "" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "السابق" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "نصب تذكاري" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "المكان" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "المكان" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "اللون" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "السابق" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "إلى أسفل" + +#. 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 "خضار" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "القيمة" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "الماء" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "عدد الأسلاك" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19424,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 "الإرتفاع" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "منخفض" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "نصف" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "ملء" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "مخبئ" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "نافورة" @@ -19456,10 +19721,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "حرّر نافورة" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "ماء شفة" @@ -19468,10 +19733,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "حرّر ماء شفة" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19479,35 +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 "مَتاجر/دكاكين" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "سوبرماركت" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "حرّر سوبرماركت" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "كوخ" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "حرّر كوخ" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19515,9 +19778,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "كشك" @@ -19525,29 +19788,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "حرّر كشك" -#: 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 "حرّر موقفحافلة نقل جماعي (باص)" - -#: 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 "حرّر شجرة" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "آلة بيع" @@ -19555,5 +19816,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "" @@ -19561,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 "تذاكر_النقل_العام" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "خرائط_النقل_العام" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "تذاكر_موقف_سيارات" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "مأكولات" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "مشروبات" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "حلويات" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "سجائر" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "صور" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "مأكولات للحيوانات" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "جرائد" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "ألعاب" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "طوابع" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "رقائق SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "قسائم تعبئة هاتفية" -#: 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 "مانع الحمل" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "سدادات قطنية" -#: 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 "جزار" @@ -19650,9 +19911,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "حرّر جزار" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "خباز" @@ -19660,9 +19921,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "حرّر خباز" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "بائع الزهور" @@ -19670,18 +19931,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "حرّر بائع الزهور" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "مأكولات عضوية" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "حرّر مبيع مأكولات عضوية" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19689,54 +19950,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "مشروبات" #. 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 "حاسوب" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "حرّر مبيع قطع حاسوب" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "إلكترونيات" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "حرّر إلكترونيات" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "حرّر مبيع Hifi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "أثاث/فرش" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "حرّر مبيع فرش/أثاث" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19744,9 +20005,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "خردوات/أدوات منزلية" @@ -19754,9 +20015,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "حرّر مخزن خردوات/أدوات منزلية" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19764,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 "قرطاسية" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "حرّر مبيع قرطاسية" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "حلاق" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "حرّر حلاق" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "أحذية" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "حرّر أحذية" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "ألعاب" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "حرّر مبيع ألعاب" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "مرئيّات" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "حرّر مبيع مرئيّات" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "تنظيف جاف" @@ -19819,9 +20080,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "حرّر تنظيف جاف" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "مصبغة/غسيل" @@ -19829,9 +20090,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "حرّر مصبغة/غسيل" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "نشاطات في الخلاء" @@ -19839,32 +20100,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "حرّر متجر نشاطات في الخلاء" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "حرّرمبيع لوازم للأنشطة رياضية" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "حرّر نظاراتي" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "نقود/أموال" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "مصرف" @@ -19872,14 +20133,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "حرّر مصرف" -#: 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 "صرّاف آلي" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "صرّاف" @@ -19887,5 +20148,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "حرّر صرّاف" @@ -19893,15 +20154,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "حرّر صراف آلي" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "صحة" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "أطباء" @@ -19909,18 +20170,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "حرّر أطباء" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "طبيب أسنان" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "حرّر طبيب أسنان" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "صيدلية" @@ -19928,5 +20189,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "حرّر صيدلية" @@ -19934,9 +20195,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "مستشفى" @@ -19944,10 +20205,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "حرّر مستشفى" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "نقطة دخول طوارئ" @@ -19956,5 +20217,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "حرّر نقطة دخول طوارئ" @@ -19963,20 +20224,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "رقم النقطة" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "إسم النقطة" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "رقم الهاتف" #. 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 "إستعمل رمز دولي مثل 12-345-67890" @@ -19984,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 "بيطري" @@ -19991,55 +20252,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "حرّر بيطري" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "قارة" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "حرّر قارة" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "وطن" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "حرّر وطن" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "دولة/ولاية" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "حرّر دولة/ولاية" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "قطر/منطقة" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "حرّر قطر/منطقة" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -20047,15 +20308,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "مدينة" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "حرّر مدينة" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "بلدة" @@ -20063,10 +20324,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "حرّر بلدة" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "ضاحية" @@ -20074,25 +20335,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "حرّر ضاحية" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "قرية" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "حرّر قرية" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "قرية صغيرة" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "حرّر قرية صغيرة" @@ -20100,5 +20361,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "محلة" @@ -20106,10 +20367,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "حرّر محلة" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "جزيرة" @@ -20117,24 +20378,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "حرّر جزيرة" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "إلى اليسار" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "حرّر كوخ" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "مدخل كهف" @@ -20142,10 +20401,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "حرّر مدخل كهف" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "قمّة" @@ -20153,10 +20412,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "حرّر قمّة" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "جليد" @@ -20164,10 +20423,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "حرّر جليد" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "بركان" @@ -20175,70 +20434,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "حرّر بركان" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "الحدود" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "دولية" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "حرّر حدود دولية" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "إدارية" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "مدنية" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "حرّر الحدود السياسية" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "محمية وطنية (بيئية)" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "حرّر محمية وطنية (التنوع البيئي)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "إستعمال الأرض" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "شجرة" @@ -20247,15 +20506,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "حرّر شجرة" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "حرّر اإسم النباتي" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "حرج" @@ -20264,5 +20523,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "حرّر حرج" @@ -20270,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 "صنوبري الثمر" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "مختلط" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "غابة" @@ -20289,14 +20548,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "حرّر غابة" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "محمية طبيعية" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "حرّر محمية طبيعية" @@ -20304,25 +20563,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "حصاة" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "حرّر حصاة" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "أشجار منخفضة" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "حرّر أشجار منخفضة" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20330,10 +20589,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "هوّة" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20341,5 +20600,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "حرّر أرض بور" @@ -20347,5 +20606,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "فناء مزرعة" @@ -20354,45 +20613,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "حرّر فناء مزرعة" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "أرض زراعية" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "حرّر أرض زراعية" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "مرج" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "حرّر مرج" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "كرم عنب" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "حرّر كرم عنب" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "حصص سكنية" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "حرّر حصص سكنية" @@ -20400,25 +20659,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "حديقة" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "حرّر حديقة" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "عشب" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20426,10 +20685,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "شائع" @@ -20437,20 +20696,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "حرّر شائع" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "متنزه" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "حرّر متنزه" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "ميدان ألعاب" @@ -20458,5 +20717,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "حرّر ميدان ألعاب" @@ -20464,15 +20723,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "منطقة سكنية" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "حرّر منطقة سكنية" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "مقبرة" @@ -20480,9 +20739,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "حرّر مقبرة" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "مقبرة" @@ -20490,39 +20749,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "حرّر إستعمال الأرض كمقبرة" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "بيع بلمفرق" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "حرّر بيع بلمفرق" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "تجاري" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "حرّر إستعمال تجاري للأرض" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "صناعي" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "حرّر الإستعمال الصناعي" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "أرض سكة حديد" @@ -20530,15 +20789,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "حرّر أرض سكة حديد" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "عسكري" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "حرّر الإستخدام العسكري للأرض" @@ -20546,55 +20805,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "موقع ورشة إعمار" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "حرّر موقع ورشة إعمار" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "حقل أخضر" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "حرّر إستعمال الأرض كحقل أخضر" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "مطمر نفايات" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "حرّر مطمر نفايات" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "كسّارة، مقلع حجارة" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "حرّر كسّارة / مقلع حجارة" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "متعدد الضلوع" @@ -20604,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 "حرّر متعدد الضلوع" @@ -20611,10 +20870,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "الفلق الخارجي" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "حرّر الفلق الخارجي" @@ -20622,5 +20881,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "حصر الإنعطاف" @@ -20629,5 +20888,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "حرّر حصر الإنعطاف" @@ -20635,34 +20894,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "حصر" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "إنعطاف_يمين_ممنوع" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "على_الطول_ممنوع" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "رجوع_ممنوع" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "إنعطاف_يميني_فقط" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "على_الطول_فقط" @@ -20671,15 +20930,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "من الطريق" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "مروراً بلعقدة أو الطريق" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "إلى الطريق" @@ -20687,5 +20946,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "الطريق" @@ -20694,5 +20953,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "حرّر طريق" @@ -20700,5 +20959,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "نوع الطريق" @@ -20706,5 +20965,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20770,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 @@ -20777,17 +21036,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "حافلة (باص)" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "الطريق" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "عبارة بحرية" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20840,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 @@ -20847,13 +21106,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "ترام" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20867,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 "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "وصف الرمز" @@ -20878,31 +21137,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "الشبكة" #. 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 "المقترح" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "البديل" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "المؤقت" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "الإتصال" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "اللون (hex)" @@ -20911,30 +21170,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "فلق الطريق" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "الفلق الأمامي" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "الفلق الخلفي" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "نقطة التوقف" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "نقطة التوقف الأمامية" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "نقطة التوقف الخلفية" @@ -24087,76 +24346,4 @@ msgstr "تاريخي" -#. 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 "خضار" - #. color green #. @@ -25124,75 +25311,74 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ 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 "كل الطرقات كانت فارغة" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟" + +#~ msgid "Merge Anyway" +#~ msgstr "ادمجعلى كلّ حال" + +#~ msgid "Unknown version" +#~ msgstr "نسخة مجهولة" + +#~ msgid " has zero ref" +#~ msgstr "لا يوجد لــ أي مرجع" + +#~ msgid "Ill-formed node id" +#~ msgstr "ضذوذ تكوين معرف العقدة" + +#~ msgid "Aborting..." +#~ msgstr "إجهاض..." + +#~ msgid "false" +#~ msgstr "خاطئ" + +#~ msgid "true" +#~ msgstr "حقيقي" + +#~ msgid "different" +#~ msgstr "مختلف" + +#~ msgid "Rotate" +#~ msgstr "أدر" + +#~ msgid "Change" +#~ msgstr "غيّر" + +#~ msgid "Move" +#~ msgstr "حرك" + +#~ msgid "unnamed" +#~ msgstr "غيرمسمى" #~ msgid "No document open so nothing to save." #~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." -#~ msgid "Delete {1} {0}" -#~ msgstr "أمحي {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" - -#~ msgid "Delete Layer" -#~ msgstr "أمحي الطبقة" - -#~ msgid "Authors: {0}" -#~ msgstr "المؤلفون: {0}" - -#~ msgid "Edit Information Office" -#~ msgstr "حرّر مكتب إستعلامات" - -#~ msgid "Map Type" -#~ msgstr "نوع الخريطة" +#~ msgid "Unknown file extension." +#~ msgstr "إمتداد ملف غير معروف." + +#~ msgid "Email" +#~ msgstr "البريد الإلكتروني" + +#~ msgid "Data Layer" +#~ msgstr "طبقة المعطيات" + +#~ msgid "citymap" +#~ msgstr "خريطة المدينة" #~ msgid "map" #~ msgstr "خريطة" - -#~ msgid "citymap" -#~ msgstr "خريطة المدينة" - -#~ msgid "bicyclemap" -#~ msgstr "خريطة راكب دراجة" - -#~ msgid "Board Type" -#~ msgstr "نوع اللوحة" - -#~ msgid "board" -#~ msgstr "اللوح" - -#~ msgid "Aborting..." -#~ msgstr "إجهاض..." - -#~ msgid "false" -#~ msgstr "خاطئ" - -#~ msgid "true" -#~ msgstr "حقيقي" - -#~ msgid "different" -#~ msgstr "مختلف" - -#~ msgid "Rotate" -#~ msgstr "أدر" - -#~ msgid "Change" -#~ msgstr "غيّر" - -#~ msgid "Move" -#~ msgstr "حرك" - -#~ msgid "unnamed" -#~ msgstr "غيرمسمى" - -#~ msgid "Unknown file extension." -#~ msgstr "إمتداد ملف غير معروف." - -#~ msgid "Email" -#~ msgstr "البريد الإلكتروني" - -#~ msgid "Data Layer" -#~ msgstr "طبقة المعطيات" #~ msgid "" @@ -25223,4 +25409,7 @@ #~ msgstr "غير قادر على الإتصال بلمخدم." +#~ msgid "Authors: {0}" +#~ msgstr "المؤلفون: {0}" + #~ msgid "Occupied By" #~ msgstr "المشغول من" @@ -25232,7 +25421,4 @@ #~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة" - #~ msgid "Click Reload to refresh list" #~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة" @@ -25244,7 +25430,13 @@ #~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." +#~ msgid "Delete Layer" +#~ msgstr "أمحي الطبقة" + #~ msgid "Conflicts: {0}" #~ msgstr "التناقضات: {0}" +#~ msgid "Delete {1} {0}" +#~ msgstr "أمحي {1} {0}" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -25253,4 +25445,7 @@ #~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" +#~ msgid "bicyclemap" +#~ msgstr "خريطة راكب دراجة" + #~ msgid "There were conflicts during import." #~ msgstr "حصل تعارض حين الإستيراد." @@ -25265,9 +25460,12 @@ #~ msgstr "محرّر العلاقات: {0}" -#~ msgid "position" -#~ msgstr "المكان" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "بعض العقد موجودة (تقريباً) في الخطّ" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم." #~ msgid "Oberpfalz Geofabrik.de" @@ -25290,4 +25488,16 @@ #~ "HREF=\"{1}\">بِلغتك." +#~ msgid "Edit Information Office" +#~ msgstr "حرّر مكتب إستعلامات" + +#~ msgid "Map Type" +#~ msgstr "نوع الخريطة" + +#~ msgid "Board Type" +#~ msgstr "نوع اللوحة" + +#~ msgid "board" +#~ msgstr "اللوح" + #~ msgid "Login name (email) to the OSM account." #~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم." Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 17594) +++ /applications/editors/josm/i18n/po/bg.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-09-05 12:00+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-12 15:43+0000\n" "Last-Translator: pl71 \n" "Language-Team: Bulgarian \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:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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,19 +32,21 @@ msgstr "Помощ" -#: ../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 "" -"Проекцията {0} не може да бъде активирана. Използва се меркаторна проекция." - -#: ../core/src/org/openstreetmap/josm/Main.java:297 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/Main.java:534 +"Проекцията {0} не може да бъде активирана. Използва се меркаторска проекция." + +#: ../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 @@ -60,8 +62,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 @@ -75,6 +77,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 @@ -84,5 +86,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 @@ -102,54 +104,53 @@ #: ../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 "Грешка" -#: ../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] "Има несъхранени промени. Да ги отхвърлим ли за да продължим?" -msgstr[1] "Има несъхранени промени. Да ги отхвърлим ли за да продължим?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"Има незапазени промени в {0} слой. Отхвърляне на промените и продължаване?" +msgstr[1] "" +"Има незапазени промени в {0} слоя. Отхвърляне на промените и продължаване?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Незаписани промени" -#: ../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 "Запис и Изход" -#: ../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 "Откажи промените и Изход" -#: ../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 @@ -158,11 +159,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 @@ -176,20 +178,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 "Отмяна" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{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 @@ -206,16 +208,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 @@ -245,16 +247,18 @@ msgstr "Внимание" -#: ../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 "Игнориране неправилен адрес на файл: \"{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 -#, fuzzy, java-format +#: ../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}" msgstr "" -"Невъзможно прочитането на файла ''{0}''. Грешката е:
{1}" +"Невъзможно четенето от файла ''{0}''.
Грешката е:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -341,5 +345,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 "Разширения" @@ -354,22 +358,19 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: Неочакван формат на базовия URL на API. Пренасочването към " -"страницата с историята на OSM вероятно ще е невъзможно. Базов URL на API: " -"\"{0}\"" +"ПРЕДУПРЕЖДЕНИЕ: неочакван формат на адреса на API. Пренасочването към " +"страницата с информация или история за примитивът на OSM вероятно е " +"невъзможно. Базовият адрес на API е: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: Неочакван формат на базовия URL на API. Пренасочването към " -"страницата с историята на OSM вероятно ще е невъзможно. Базов URL на API: " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -480,9 +481,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 @@ -516,6 +517,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 @@ -534,11 +535,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 "Информация" @@ -560,5 +561,5 @@ msgstr "Изберете не по-малко от три точки." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -569,10 +570,10 @@ "максимален - {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" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -583,5 +584,5 @@ "примитив {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -592,9 +593,9 @@ "максимално позволената дължина {2}. Дължината на стойностите е {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Нарушение на предсъстоянието." -#: ../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}" @@ -649,77 +650,61 @@ msgstr "Няма конфликти за показване." -#: ../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 "Обедини линии" -#: ../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 "Обединява няколко отделни линии в една." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Обединяване на линии, влизащи в различни релации?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Комбиниране въпреки всичко" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Избраните пътища имат различни участия в релации. Въпреки това искате ли да " +"ги обеденим?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Промени посоката?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Връщане и Комбиниране" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Линиите при текущите им посоки, не може да се обединят. Да обърнем ли " +"посоката на някои от тях?" + +#: ../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 "" +"Не може да се обединят линиите (Не могат да бъдат представени като една " +"последователност от възли)." + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Обединяване {0} линии" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Обединяване на линии, влизащи в различни релации?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Комбиниране въпреки всичко" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Избраните пътища имат различни участия в релации. Въпреки това искате ли да " -"ги обеденим?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Промени посоката?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Връщане и Комбиниране" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Линиите при текущите им посоки, не може да се обединят. Да обърнем ли " -"посоката на някои от тях?" - -#: ../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 "Въведете стойности за всички конфликти." - -#: ../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 "Разрешаване на конфликти" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Обединяване {0} линии" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Всички линии бяха празни" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Не може да се обединят линиите (Не могат да бъдат представени като една " -"последователност от възли)." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -773,5 +758,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 "Изтриване" @@ -781,15 +766,15 @@ msgstr "Изтриване на избраните обекти." -#: ../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 "Презаписване" -#: ../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 "Файлът съществъва. Да го подменя ли?" @@ -819,10 +804,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}" @@ -853,5 +838,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 @@ -895,7 +880,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Всички изображения" +msgstr "Всички формати" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1034,1068 +1018,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 "Обедини точки" -#: ../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 "Обедини точките в най-старата от тях." -#: ../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 "Моля, изберете поне две точки за обединение." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Обединяване точки от различни релации?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Сливане въпреки всичко" - -#: ../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 "" -"Избраните точки участват в различни връзки. Искате ли да ги обедините, " -"въпреки това?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Точките не могат да се обединят: Ще трябва да се изтрие линия, който вече се " -"използва." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Обедини {0} точки" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Обединява избраното" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Обединява текущо избраните примитиви в друг слой" - -#: ../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 "Огледално" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Обръщане огледално на избраните възли и пътища." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Моля изберете поне един възел или път." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "нагоре" - -#: ../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 "Преместване обекти {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "надолу" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "наляво" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "надясно" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Преместване {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Премества обектите {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 "Невъзможно да се премества обектите извън границите на света." - -#: ../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 "Нов" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Създай нова карта." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Отвори..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Отваряне на файл." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Отваряне на файл." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Неизвестна роля ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Отваряне на местоположение…" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Отваряне на връзка URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "На отделен слой" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Въведете URL за сваляне:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Местоположение на изтеглянето" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL за сваляне" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ортогонализиране" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "" -"Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Само два точки е позволено да бъдат избрани" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Селекцията трябва да се състои само от линии." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." - -#: ../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 "" -"Вие използвате проекцията EPSG:4326, която може да доведе
до " -"нежелани резултати при правоъгълни подравнявания.
Сменете проекцията за " -"избягване на това предупреждение.
Ще продължите ли?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Само една точка е избрана" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ортогонализиране" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "Поставяне" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Поставяне на съдържанието на буфера" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Поставяне на маркери" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Приложи маркерите от буфера за копиране към всички избрани обекти." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Зареждане {0}" -msgstr[1] "Зареждане {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Отмяна изтриването на {0} примитива." -msgstr[1] "Отмяна изтриването на {0} примитива." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Настройки…" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Отваряне страница с предпочитания за глобалните параметри." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Настройки" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Отново" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Повтаряне на последното отменено действие." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Преименуване на слой" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Също преименувай файл" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Невъзможно преименуването на файла ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Промяна посоката на линиите" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Обръща посоката на линиите на всички избрани пътища." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Моля, изберете поне една линия." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Промяна посоката на линиите" - -#: ../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 "Запазване" - -#: ../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 "Запазване на текущите данни." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Файлът {0} съществува. Презаписване?" - -#: ../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 "Празен документ" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Документът не съдържа данни" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Записване въпреки всичко" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Конфликти" - -#: ../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 "" -"Има неразрешени конфликти. Конфликтите няма да бъдат записани и ще бъдат " -"обработени все едно сте ги отменили всички. Да продължаваме ли?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Отхвърляне конфликтите и записване" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Съхраняване OSM файл" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Съхраняване GPX файл" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Запис на слой" - -#: ../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 "Запазване като…" - -#: ../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 "Записване на текущите данни в нов файл." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Избиране на всичко" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Избиране на всички неизтрити обекти в слоя с данни. Това избира и непълните " -"обекти също." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Показване статус" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Показва отчет на статуса с полезна информация, която може да бъде свързана с " -"грешката." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Помощ: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Статус Репорт" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Копиране в клипборда и затваряне" - -#: ../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 "Затваряне" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Разделяне на линия" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Разделяне на линията в избраната точка." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Текушата селекция не може да се използва за разделяне." - -#: ../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] "Избраната точка не е в средата на път." -msgstr[1] "Избраните точки не са в средата на път." - -#: ../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] "" -"Съществува повече от един път използващи точката, която сте избрали. Моля " -"изберете и пътя." -msgstr[1] "" -"Съществува повече от един път използващи точките, която сте избрали. Моля " -"изберете и пътя." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Избраните точки не се явяват част от един и същ път." - -#: ../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] "Избраният път не съдържа избраната точка." -msgstr[1] "Избраният път не съдържа избраните точки" - -#: ../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 "" -"Трябва да изберете две или повече точки за да разделите затворен (кръгов) " -"път." - -#: ../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 "" -"Пътят не може да бъде разделен в избраните точки. (Съвет: Изберете точки в " -"средата на пътя.)" - -#: ../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 "Разделяне път {0} на {1} части" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Затваряне на списък промени по версии..." - -#: ../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 "Затваряне на списък промени по версии..." - -#: ../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 "Отваряне на списък промени по версии..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "Покажи/скрий GPX линии" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Съединявай с линии точките от GPS следите." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Вкл./изкл. глобалната настройка ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Разсъедини пътища" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Дублиране на точки, които се използват от няколко линии." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Тази точка не е свързана с към нещо друго." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Никой от тези точки не са прикрепени за нещо друго." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Нито една от тези тези линии не е прикрепена за други" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Текущато избраните обекти не може да се разсъединят." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Изберете един от вариантите:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Един маркиран възел, или" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Една точка, която се използва от няколко линии, или" - -#: ../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 "" -"* Една точка, която се използва от няколко линии и една от тези линии, или" - -#: ../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 "" -"* Една линия, която има точки, които се използват от няколко линии, или" - -#: ../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 "" -"* Една линия и една или няколко от нейните точки, които са използвани от " -"няколко линии." - -#: ../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 "" -"Забележка: Ако една линия е избрана, тя ще получи дублирани възли и те\n" -"ще бъдат селектирани. В противен случай, всички линии ще получат \n" -"дублирани възли и всички възли ще бъдат избрани." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Незапелен възел" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Дублирай в {0} точки" - -#. 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 "Дублирай {0} точки в {1} точки" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Отмяна" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Отменяне на последното действие." - -#: ../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 "Размаркиране всичко" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Сваля избора от всички обекти." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Размаркиране всичко (focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Размаркиране всичко (escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Обновяване на данните" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Обновяване на текущия слой с данни от сървъра (презареждане на данните)" - -#. 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 "Актуализиране на данните" - -#: ../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 "Не е намерен примитив с id {0} в текущия набор от данни" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Обновява избраното" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Обновява текущо избраните примитиви от сървъра." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Няма избрани примитиви за обновяване." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Няма нищо избрано." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Качи на OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Качване на всички промени на OSM." - -#: ../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 "Има неразрешени конфликти. Първо трябва да ги разрешите." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Нищо за качване. Първо създайте някакви данни." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Няма промени за качване." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Синхронизирани само {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 "Синхронизиране на целия набор данни" - -#: ../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 "Забелязан е конфликт." - -#. 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 "неочаквана върната стойност {0}" - -#: ../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 "" -"Качването неуспешно защото сървърът има по-нова " -"версия
на някой от вашите възли, пътища, или отношения.

Кликнете " -"{0} за да синхронизирате цялата база данни със сървъра." -"
Кликнете {1} за отказ и продължаване на редакциите." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Предупреждение: Началната част \"{0}\" не отговаря на очаквания шаблон \"{1}" -"\"!" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " -"\"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Качването не стана.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Качването към OSM API пропадна." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Обновяване на примитива." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Качване на тези промени?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Качване на промени" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Редактиране на нова връзка в слой ''{0}''" - -#: ../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 "Добавяне на нова точка към съществуващ път" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "качва всички промени в една заявка" - -#: ../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 "" -"Активирай за качване на всички промени в една заявка, Изключи за използване " -"на заявка за всяка променена примитива" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишете измененията на качваните от вас данни:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Настройки на картата" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "набор промени" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Обекти за добавяне:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Променени обекти:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Обекти за изтриване:" - -#: ../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] "Обекти за добавяне:" -msgstr[1] "Обекти за добавяне:" - -#: ../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] "Променени обекти:" -msgstr[1] "Променени обекти:" - -#: ../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] "Обекти за изтриване:" -msgstr[1] "Обекти за изтриване:" - -#: ../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 "Последни промени: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Увеличаване" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Намаляване" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Назад" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Прескочи назад." - -#: ../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 "Звук: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "По-бързо" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "По-бързо възпроизвеждане." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Напред" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Прескочи напред" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Следващ маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Възпроизвеждане на следващия маркер." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Изпълнение/Пауза" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Изпълнение/Пауза на звука." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Предишен маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Възпроизведи предишния маркер." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "По-бавно" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "По-бавно възпроизвеждане" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Сваляне на GPS данни" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Свалени GPX данни" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Изходни GPS данни" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Сваляне на данни" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" -"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "Никакви данни не са импортирани" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap данни" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Сваляне {0} от {1} ({2} остава)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "Следните грешки се получиха по време на масовото сваляне:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Грешки при Сваляне" - -#: ../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 "Изтрити или преместени примитиви" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Режим на изтриване" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Изтриване на точки или линии." - -#: ../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 "Режим: {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 "" -"Натиснете за изтриване. Shift: изтриване на сегменти от път. Alt: за да не " -"изтрива неизползваните възли при изтриване на път. Ctrl: изтриване на " -"обекти, към които има обръщение." - +#: ../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 @@ -2106,7 +1047,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 @@ -2115,6 +1057,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 @@ -2145,4 +1087,911 @@ msgstr "параметърът ''{0}'' не трябва да е празен" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Точките не могат да се обединят: Ще трябва да се изтрие линия, който вече се " +"използва." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Обедини {0} точки" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Обединява избраното" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Обединява текущо избраните примитиви в друг слой" + +#: ../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 "Огледално" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Обръщане огледално на избраните възли и пътища." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Моля изберете поне един възел или път." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "нагоре" + +#: ../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 "Преместване обекти {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "надолу" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "наляво" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "надясно" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Преместване {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Премества обектите {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 "Невъзможно да се премества обектите извън границите на света." + +#: ../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 "Нов" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Създай нова карта." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Отвори..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Отваряне на файл." + +#: ../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 "Отваряне на файла ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Отваряне на местоположение…" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Отваряне на връзка URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "На отделен слой" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Въведете URL за сваляне:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Местоположение на изтеглянето" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL за сваляне" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ортогонализиране" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "" +"Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Само два точки е позволено да бъдат избрани" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Селекцията трябва да се състои само от линии." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." + +#: ../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 "" +"Вие използвате проекцията EPSG:4326, която може да доведе
до " +"нежелани резултати при правоъгълни подравнявания.
Сменете проекцията за " +"избягване на това предупреждение.
Ще продължите ли?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Само една точка е избрана" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ортогонализиране" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "Поставяне" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Поставяне на съдържанието на буфера" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Поставяне на маркери" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Приложи маркерите от буфера за копиране към всички избрани обекти." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Поставяне на {0} етикет" +msgstr[1] "Поставяне на {0} етикета" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "за {0} примитив" +msgstr[1] "за {0} примитива" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Настройки…" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Отваряне страница с предпочитания за глобалните параметри." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Настройки" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Отново" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Повтаряне на последното отменено действие." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Преименуване на слой" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Също преименувай файл" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Невъзможно преименуването на файла ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Промяна посоката на линиите" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Обръща посоката на линиите на всички избрани пътища." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Моля, изберете поне една линия." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Промяна посоката на линиите" + +#: ../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 "Запазване" + +#: ../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 "Запазване на текущите данни." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Файлът {0} съществува. Презаписване?" + +#: ../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 "Празен документ" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Записване въпреки всичко" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Документът не съдържа данни" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Конфликти" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Отхвърляне конфликтите и записване" + +#: ../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 "" +"Има неразрешени конфликти. Конфликтите няма да бъдат записани и ще бъдат " +"обработени все едно сте ги отменили всички. Да продължаваме ли?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Съхраняване OSM файл" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Съхраняване GPX файл" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Запис на слой" + +#: ../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 "Запазване като…" + +#: ../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 "Записване на текущите данни в нов файл." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Избиране на всичко" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Избиране на всички неизтрити обекти в слоя с данни. Това избира и непълните " +"обекти също." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Показване статус" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Показва отчет на статуса с полезна информация, която може да бъде свързана с " +"грешката." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Помощ: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Статус Репорт" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Копиране в клипборда и затваряне" + +#: ../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 "Затваряне" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Разделяне на линия" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Разделяне на линията в избраната точка." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Текушата селекция не може да се използва за разделяне." + +#: ../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] "Избраната точка не е в средата на път." +msgstr[1] "Избраните точки не са в средата на път." + +#: ../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] "" +"Съществува повече от един път използващи точката, която сте избрали. Моля " +"изберете и пътя." +msgstr[1] "" +"Съществува повече от един път използващи точките, която сте избрали. Моля " +"изберете и пътя." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Избраните точки не се явяват част от един и същ път." + +#: ../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] "Избраният път не съдържа избраната точка." +msgstr[1] "Избраният път не съдържа избраните точки" + +#: ../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 "" +"Трябва да изберете две или повече точки за да разделите затворен (кръгов) " +"път." + +#: ../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 "" +"Пътят не може да бъде разделен в избраните точки. (Съвет: Изберете точки в " +"средата на пътя.)" + +#: ../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 "Разделяне път {0} на {1} части" + +#: ../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 "Покажи/скрий GPX линии" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Съединявай с линии точките от GPS следите." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Вкл./изкл. глобалната настройка ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Разсъедини пътища" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Дублиране на точки, които се използват от няколко линии." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Тази точка не е свързана с към нещо друго." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Никой от тези точки не са прикрепени за нещо друго." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Нито една от тези тези линии не е прикрепена за други" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Текущато избраните обекти не може да се разсъединят." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Изберете един от вариантите:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Един маркиран възел, или" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Една точка, която се използва от няколко линии, или" + +#: ../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 "" +"* Една точка, която се използва от няколко линии и една от тези линии, или" + +#: ../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 "" +"* Една линия, която има точки, които се използват от няколко линии, или" + +#: ../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 "" +"* Една линия и една или няколко от нейните точки, които са използвани от " +"няколко линии." + +#: ../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 "" +"Забележка: Ако една линия е избрана, тя ще получи дублирани възли и те\n" +"ще бъдат селектирани. В противен случай, всички линии ще получат \n" +"дублирани възли и всички възли ще бъдат избрани." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Незапелен възел" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Дублирай в {0} точки" + +#. 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 "Дублирай {0} точки в {1} точки" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Отмяна" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Отменяне на последното действие." + +#: ../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 "Размаркиране всичко" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Сваля избора от всички обекти." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Размаркиране всичко (focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Размаркиране всичко (escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Обновяване на данните" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Обновяване на текущия слой с данни от сървъра (презареждане на данните)" + +#. 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 "Актуализиране на данните" + +#: ../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 "Не е намерен примитив с id {0} в текущия набор от данни" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Обновява избраното" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Обновява текущо избраните примитиви от сървъра." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Няма избрани примитиви за обновяване." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Няма нищо избрано." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Качи на OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Качване на всички промени на OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Няма слоеве към които слоя източник
''{0}''.
би могъл да се " +"обедини." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Нищо за качване. Първо създайте някакви данни." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Няма промени за качване." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Синхронизирани само {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 "Синхронизиране на целия набор данни" + +#: ../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 "Забелязан е конфликт." + +#. 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 "неочаквана върната стойност {0}" + +#: ../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 "" +"Качването неуспешно защото сървърът има по-нова " +"версия
на някой от вашите възли, пътища, или отношения.

Кликнете " +"{0} за да синхронизирате цялата база данни със сървъра." +"
Кликнете {1} за отказ и продължаване на редакциите." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Предупреждение: Началната част \"{0}\" не отговаря на очаквания шаблон \"{1}" +"\"!" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" +"Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Качването не стана.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Качването към OSM API пропадна." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Обновяване на примитива." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Качване на данни за слой ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Увеличаване" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Намаляване" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Назад" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Прескочи назад." + +#: ../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 "Звук: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "По-бързо" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "По-бързо възпроизвеждане." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Напред" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Прескочи напред" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Следващ маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Възпроизвеждане на следващия маркер." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Изпълнение/Пауза" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Изпълнение/Пауза на звука." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Предишен маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Възпроизведи предишния маркер." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "По-бавно" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "По-бавно възпроизвеждане" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Сваляне на GPS данни" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Свалени GPX данни" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Изходни GPS данни" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Сваляне на данни" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Никакви данни не са импортирани" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap данни" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Сваляне {0} от {1} ({2} остава)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Следните грешки се получиха по време на масовото сваляне:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Грешки при Сваляне" + +#: ../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 "Изтрити или преместени примитиви" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Режим на изтриване" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Изтриване на точки или линии." + +#: ../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 "Режим: {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 "" +"Натиснете за изтриване. Shift: изтриване на сегменти от път. Alt: за да не " +"изтрива неизползваните възли при изтриване на път. Ctrl: изтриване на " +"обекти, към които има обръщение." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2259,18 +2108,18 @@ "тази точка." -#: ../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 "Избиране" -#: ../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" @@ -2279,18 +2128,18 @@ msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2298,11 +2147,8 @@ "Really move them?" msgstr "" -"Местите повече от {0} елемента. Преместването на такова голямо количество " -"елементи често е грешка.\n" -"Да се преместят ли наистина?" - -#: ../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 "" +msgstr "Винаги да се премества и този прозорец да не се показва повече" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2424,7 +2270,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - обекти с даденото ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2478,41 +2323,41 @@ msgstr "Търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Стартиране търсене" -#: ../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 "Не е намерено съвпадение за ''{0}''" -#: ../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 "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../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 "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" -#: ../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 "Намерени са {0} съвпадения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2526,5 +2371,5 @@ "{2}" -#: ../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 "" @@ -2532,10 +2377,10 @@ "ключ=стойност." -#: ../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 "Синтактична грешка: Шаблонът {0} в {1} е недопустим!" -#: ../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" @@ -2544,26 +2389,26 @@ "връзка." -#: ../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 "Неочакван знак: {0}" -#: ../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 "" @@ -2572,5 +2417,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." @@ -2607,62 +2452,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Добавяне на точка" +msgstr "Добавяне на възел {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Добави {0} {1}" +msgstr "Добавяне на път {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Връзки: {0}" +msgstr "Добавяне на отношение {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Списък с промени {0}" +msgstr "Промяна на възел {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Списък с промени {0}" +msgstr "Промяна на път {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Промяна на връзка" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Изтриване \"{0}\" за {1} ''{2}''" +msgstr "Премахване на \"{0}\" за възел ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Изтриване \"{0}\" за {1} ''{2}''" +msgstr "Премахване на \"{0}\" за път ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Изтриване \"{0}\" за {1} ''{2}''" +msgstr "Премахване на \"{0}\" за отношение ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Задаване {0}={1} за {2} ''{3}''" +msgstr "Направи {0}={1} за възел ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Задаване {0}={1} за {2} ''{3}''" +msgstr "Направи {0}={1} за път ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Задаване {0}={1} за {2} ''{3}''" +msgstr "Направи {0}={1} за отношение ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2739,30 +2584,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] "Изтриване {0} {1}" -msgstr[1] "Изтриване {0} {1}" +msgstr[0] "Изтриване на {0} обект" +msgstr[1] "Изтриване на {0} обекта" #: ../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] "Режим на изтриване" -msgstr[1] "Режим на изтриване" +msgstr[0] "Изтриване на {0} възел" +msgstr[1] "Изтриване на {0} възела" #: ../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] "Изтриване {0} {1}" -msgstr[1] "Изтриване {0} {1}" +msgstr[0] "Изтриване на {0} път" +msgstr[1] "Изтриване на {0} пътя" #: ../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] "Изтриване от връзка" -msgstr[1] "Изтриване от връзка" +msgstr[0] "Изтриване на {0} отношение" +msgstr[1] "Изтриване на {0} отношения" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2776,20 +2621,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Избраното - \"{0}\" - се използва от връзка \"{1}\" в роля {2}.\n" -"Изтриване от връзката?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Селекцията \"{0}\" се използва от релация \"{1}\".\n" -"Изтриване от релацията?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2800,5 +2641,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." @@ -2881,17 +2722,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Разрешаване {0} конфликти в етикетите за {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Разрешаване {0} конфликти в етикетите за {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Разрешаване {0} конфликти в етикетите за {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2901,17 +2742,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Разрешаване на конфликтите във версиите за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Разрешаване на конфликтите във версиите за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Разрешаване на конфликтите във версиите за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3049,9 +2890,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3120,5 +2961,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 @@ -3126,22 +2967,47 @@ msgstr "Списък с промени {0}" -#: ../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 "параметърът {0} трябва да е > 0. Сега е {1}" -#: ../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 "параметърът ''{0}'' не трябва да е празен" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Грешка: {0}" -#: ../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 "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "неочаквана върната стойност {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Неочакван знак: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Неочакван знак: {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3155,11 +3021,16 @@ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''" -#: ../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 "" @@ -3208,11 +3079,11 @@ #, java-format msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}" + +#: ../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." @@ -3221,118 +3092,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 "В релацията има член ''{0}'', който е бил изтрит." -#: ../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 "Пътя ''{0}'' е с по-малко от две точки." -#: ../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 "Неизвестна роля ''{0}''." -#: ../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 "Неизвестен тип членство за ''{0}''." -#: ../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 "Стил за ограничение {0} не е намерен." -#: ../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 "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../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 "Не-Път ''{0}'' в мултиполигон." -#: ../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 "Липсва външен път за мултиполигон ''{0}''." -#: ../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 "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../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 "Вътрешният път ''{0}'' се намира отвън." -#: ../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 "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../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 "Стилът за външния път ''{0}'' се разминава." -#: ../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 "текст" @@ -3355,5 +3226,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" @@ -3364,5 +3235,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" @@ -3373,5 +3244,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" @@ -3455,7 +3326,9 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Отметките не могат да бъдат прочетени.
{0}" +msgstr "" +"Невъзможно прочитането на отметките от
''{0}''
Грешката е: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3486,5 +3359,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "железопътна линия" @@ -3516,132 +3389,34 @@ msgstr[1] "{0} членове" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Грешка при установяване на връзка със сървъра на OSM {0}.\n" -"Проверете URL на сървъра в настройките и Вашата интернет връзка." - -#. 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 "неизвестно" - -#: ../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 "Нарушение на предварителното състояние" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 +msgstr "Вътрешна грешка в сървъра" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Редактирай ракет" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Неизвестен хост" -#: ../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 "" -"Качването пропадна защото примитивът, който се " -"опитахте
да изтриете на съсрвъра вече е изтрит там.

Съобщението " -"за грешка е:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Примитивът вече е изтрит." @@ -3789,5 +3564,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/път/към/папката/на/JOSM/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3860,5 +3635,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}" @@ -4238,4 +4013,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 @@ -4308,8 +4085,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 @@ -4436,5 +4213,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 "изтрито" @@ -4494,5 +4271,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 "Не, изход" @@ -4536,4 +4313,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 @@ -4547,5 +4325,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 "" @@ -4651,4 +4429,40 @@ msgstr "Тяхната база данни не съдържа етикет с ключ {0}" +#: ../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 "Няма чакащи tag конфликти за разрешаване" + +#: ../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 @@ -4661,24 +4475,23 @@ msgstr "всички" -#: ../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 "Изберете цвят" - -#: ../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 -#, fuzzy, java-format +#: ../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 "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4686,12 +4499,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "параметърът ''{0}'' не трябва да е празен" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4699,15 +4512,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../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 +msgstr "" + +#: ../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 "Не е добавено още." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4716,17 +4529,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "от път" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Изтриване от връзка" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Конфликт в данните" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4750,24 +4560,8 @@ msgstr[1] "{0} релации" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Разрешение на конфликт" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Разрешаване на конфликти" - -#: ../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 "Поставяне" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4782,9 +4576,75 @@ #: ../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} начало" -msgstr[1] "{0} начало" +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 "Премахване на текущо избраните членове от тази връзка" + +#: ../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 "място" + +#: ../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 +#, fuzzy +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 "Стойност" + +#: ../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 "Еднопосочна" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Ревизия" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4811,5 +4671,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}" @@ -4840,5 +4700,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." @@ -4911,13 +4771,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 "Слой: {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 "Връзки: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5003,5 +4863,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 "<различни>" @@ -5060,5 +4920,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 "Добави" @@ -5108,5 +4968,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 "Връзки" @@ -5201,9 +5061,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] "Автор" -msgstr[1] "Автор" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5212,20 +5072,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Покажи" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Повече информация за тази възможност" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: Стартират се прозорци за преглед само на първите {0} от " -"всичките {1} избрани примитиви." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5302,5 +5158,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}" @@ -5319,9 +5175,4 @@ msgid "Child Relations" msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Роля:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5447,5 +5298,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 msgid "Delete the currently edited relation" -msgstr "" +msgstr "Изтриване на текущо редактираната врзка" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 @@ -5571,11 +5422,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 "" @@ -5589,7 +5440,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Зареждане на родителските връзки" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5716,5 +5566,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Места" @@ -5792,9 +5642,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Мащабиране: с колелцето на мишката или двойно щракване. Преместване на " +"картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5824,17 +5677,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "История за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "История за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "История за {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5843,7 +5696,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Показване историята на избрания примитив" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5876,22 +5728,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Зареждане на история за {0} с ID {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Зареждане на история за {0} с ID {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Зареждане на история за {0} с ID {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6726,52 +6578,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 "Име" @@ -6781,21 +6633,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 "Списък с промени {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Повече информация за тази възможност" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Списък с промени {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6813,7 +6663,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Име на улица" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6854,12 +6703,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Изберете стойност" +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 "Слоя ''{0}'' трябва да бъде в списъка от слоеве" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6904,6 +6752,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Поправяне конфликти маркери" +msgid "Unsaved data and conflicts" +msgstr "Разрешаване на конфликти" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6920,5 +6768,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 "" @@ -6937,5 +6785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6949,7 +6797,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Откажи промените и Изход" +msgstr "Отхвърляне и изтриване" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6962,7 +6809,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Запис и Изход" +msgstr "Запис и изтриване" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7040,7 +6886,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "При качване" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7049,17 +6894,151 @@ #: ../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 "качва всички промени в една заявка" + +#: ../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 "" +"Активирай за качване на всички промени в една заявка, Изключи за използване " +"на заявка за всяка променена примитива" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Опишете измененията на качваните от вас данни:" + +#: ../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 "Обекти за добавяне:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Променени обекти:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Обекти за изтриване:" + +#: ../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] "{0} обект за добавяне:" +msgstr[1] "{0} обекта за добавяне:" + +#: ../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] "{0} обект за промяна:" +msgstr[1] "{0} обекта за промяна:" + +#: ../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] "{0} обект за изтриване:" +msgstr[1] "{0} обекти за изтриване:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" +"Използване на съществуващия списък с промени {0}. След качване се затваря." + +#: ../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 "" +"Използване на съществуващия списък с промени {0}. След качване остава " +"отворен." + +#: ../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 "Етикети на списък с промени {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Качване на промени" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Файл" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Качване на тези промени?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Качване" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Моля въведете име на мястото." + +#: ../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 +#, fuzzy +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 "Няма избрани примитиви за обновяване." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7292,5 +7271,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." @@ -7348,7 +7326,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Сваляне на данни" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7413,4 +7390,13 @@ msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" + +#: ../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 "" +"Качването на необработени GPS данни в картата се смята за вредно." +"
Ако искате да качвате следи, погледнете тук:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7607,5 +7593,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 "Моля, изберете ред за изтриване." @@ -8089,7 +8075,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Показване на ID на обектите в списъците с избрани" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8104,7 +8089,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Показване на ID на обектите в списъците с избрани" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8484,8 +8468,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!" @@ -8542,5 +8522,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 @@ -8551,42 +8531,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Добавяне на нов слой" +msgstr "Добавяне на нов етикет" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Изтриване избрания слой." - -#: ../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 "Повече информация за тази възможност" #. 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 "Незадължителни Атрибути:" -#: ../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 "Използване шаблон ''{0}'' от група ''{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 "Използване шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "затворен път" -#: ../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 "Неизвестен тип: {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 @@ -8597,15 +8575,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {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 "Грешка при разбор {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 "Елементи от тип {0} се поддържат." -#: ../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 @@ -8615,18 +8593,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../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 "Нищо не е избрано!" -#: ../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 "Промяна параметри" @@ -8653,5 +8631,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 "Грешка! Възможно е да липсват маркери (тагове)." @@ -8667,7 +8644,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 @@ -8745,5 +8719,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}" @@ -8751,5 +8725,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" @@ -8757,5 +8731,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" @@ -8769,5 +8742,5 @@ #, java-format msgid "Unknown mode {0}." -msgstr "" +msgstr "Непознат режим {0}." #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 @@ -8776,6 +8749,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 @@ -8785,40 +8758,40 @@ msgstr "Сваляне данни от OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Редактиране връзка #{0} в слой ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8882,10 +8855,10 @@ msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}" -#: ../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 "" @@ -8893,46 +8866,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Отваряне на списък промени по версии..." - -#: ../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}" -msgstr "" +msgstr "Успешно отворен списък с промени {0}" #: ../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 "Отваряне на списък промени по версии..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Отваряне на списък промени по версии..." - -#: ../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 "Отваряне на списък промени по версии..." - -#: ../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 " @@ -8940,44 +8895,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../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 "Затваряне на списък промени по версии..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#, fuzzy, java-format +msgstr "Затваряне списък с промени {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#, java-format msgid "Leaving changeset {0} open..." -msgstr "Отваряне на списък промени по версии..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +msgstr "Списъкът с промени {0} се оставя отворен ..." + +#: ../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 "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Качване..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Изчакване 10 секунди " -#: ../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}." @@ -8996,10 +8951,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 "Файловете на сървъра на OSM са компресирани с алгоритъм bzip2" -#: ../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 "Невалиден bz2 файл." @@ -9059,6 +9014,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 сървърни файлове" @@ -9087,5 +9047,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 "" @@ -9142,74 +9102,139 @@ msgstr "Грешка при разбор." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Неизвестна версия" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Версията липсва от OSM данните." - -#: ../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 "Липсва необходимия атрибут \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Неизвестна версия: {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 "Намерен е елемент извън път." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "към няма обръщения ref." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Открит е маркер извън релация." - -#: ../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 "Непълна спецификация с 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 "Недопустим обект с 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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Неизвестна версия: {0}" + +#: ../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 "Липсва необходимия атрибут \"{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 "" @@ -9218,16 +9243,30 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, fuzzy, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "Непознат тип на член от връзка - {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440 -#, java-format -msgid "Unknown relation member type {0}" -msgstr "Непознат тип на член от връзка - {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Подготовка на OSM данните..." -#: ../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 "Подготовка на OSM данните..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Подготвяне на данните..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9273,20 +9312,39 @@ "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет." -#: ../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} остава. Качване {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} остава. Качване {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} остава. Качване {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 "Качване..." + +#: ../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 "" @@ -9294,14 +9352,4 @@ "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 "Нищо за качване. Първо създайте някакви данни." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -#, fuzzy -msgid "Starting to upload with one request per primitive ..." -msgstr "Грешка при обновяването на избраните примитиви." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 @@ -9338,12 +9386,7 @@ msgstr "Сваляне на добавката {0}..." -#: ../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 "За добавката {1} се изисква JOSM версия {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9355,4 +9398,9 @@ msgstr "Пропусни свалянето" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "За добавката {1} се изисква JOSM версия {0}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9395,20 +9443,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 "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?" -#: ../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 " @@ -9418,5 +9466,9 @@ "право да презаписва текущите." -#: ../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 "" @@ -9426,10 +9478,10 @@ "\"{0}\"." -#: ../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 "Съгласно информацията в добавката, авторът е {0}." -#: ../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." @@ -9438,9 +9490,9 @@ "за грешка." -#: ../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 " @@ -9450,13 +9502,13 @@ "да изключим разширенето." -#: ../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" @@ -9513,4 +9565,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 "неизвестно" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9586,4 +9669,94 @@ msgstr "(Текста вече е кипиран в буфера за обмен на данни)" +#: ../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 +#, fuzzy +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 "" +"Максималният размер на рамката - 0.25. Вие изискахте прекалено голяма " +"област. Или я намалете, или използвайте planet.osm" + +#: ../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 "" +"Качването пропадна защото примитивът, който се " +"опитахте
да изтриете на съсрвъра вече е изтрит там.

Съобщението " +"за грешка е:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9655,5 +9828,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9662,5 +9835,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9669,5 +9842,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9676,5 +9849,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9683,5 +9856,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9742,40 +9915,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 +msgstr "Видимост" + +#: ../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}" @@ -9783,47 +9955,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 "Качване на GPX данни беше успешно" -#: ../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 "Качване GPX следа: {0}% ({1} of {2})" -#: ../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 "Няма избран GPX слой. Не може да се качи следа." -#: ../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 "Качване на GPX следа" @@ -10043,5 +10215,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 "Съпоставяне на изображения с GPX следа" @@ -10055,13 +10227,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 "Трябва да изберете GPX следа" -#: ../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 "Няма избрана GPX следа" -#: ../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 "" @@ -10072,9 +10244,9 @@ "Очакван формат: {0}" -#: ../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 "" @@ -10085,65 +10257,65 @@ "Очакван формат: {0}" -#: ../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 "Открити {0} съвпадения на {1} в GPX следа {2}" -#: ../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 "GPX Следата е заредена" -#: ../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 "Избраната GPX следа не съдържа времена. Моля изберете друга." -#: ../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 "GPX следата няма информация за времето" -#: ../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 "Часови пояс: {0}" -#: ../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 "Минути: {0}" -#: ../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 "Секунди: {0}" -#: ../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 "Съотнесени {0} от {1} снимки към GPX следа." -#: ../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 "(Времева разлика от {0} дни)" -#: ../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 "Разминаване между следата и снимките: {0}мин {1}сек" -#: ../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 " @@ -10151,13 +10323,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 "Стойности по подразбиране" @@ -10195,5 +10367,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 "Грешка при зареждане на файла" @@ -10222,11 +10394,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Градът {0} не е открит или не е достъпен в WMS.\n" -"Моля проверете наличността на www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10242,13 +10412,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" @@ -10257,13 +10427,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 "" @@ -10386,9 +10556,9 @@ "Най-старите файлове автоматично се изтриват когато този размер се премине" -#: ../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 "Добавяне на \"source=...\" към ?" @@ -10543,7 +10713,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Избиране" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10632,5 +10801,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 "Празен слой" @@ -10734,5 +10903,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 msgid "TangoGPS Files (*.log)" -msgstr "" +msgstr "файлове на TangoGPS (*.log)" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 @@ -10742,9 +10911,9 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 msgid "TangoGPS import success" -msgstr "" +msgstr "успешно внасяне от TangoGPS" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 msgid "TangoGPS import faliure!" -msgstr "" +msgstr "неуспешно внасяне от TangoGPS!" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 @@ -11582,18 +11751,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}" @@ -11604,5 +11773,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11612,9 +11781,9 @@ "\"Картови настройки\" (Map Settings) от настройките." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender опции" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "изпълним файл на Firefox" @@ -11625,29 +11794,34 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Създаване нов възел." + +#: ../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 "" "Разширение, което позволява JOSM да бъде управляван от други приложения." -#: ../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 " @@ -11659,29 +11833,37 @@ "за да се свързват с него." -#: ../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 "" "Дистанционното управление получи заявка за зареждане на данни от API-то." -#: ../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 "Подробности на заявката: {0}" -#: ../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 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "" +"Дистанционното управление получи заявка за зареждане на данни от API-то." + +#: ../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 "" @@ -11993,5 +12175,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "неочакван номер на колона {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -12155,5 +12337,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." -msgstr "" +msgstr "Няма намерено пресичане. Няма направени промени." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 @@ -12185,25 +12367,33 @@ "проверете дали няма да се появят грешки." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Въведете стойности за всички конфликти." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Разрешаване на конфликти" + #: ../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 "Функция свързване на области" @@ -12278,6 +12468,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 "Грешки при проверка" @@ -12287,10 +12477,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 "" @@ -12381,51 +12571,66 @@ 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 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Изчакване 10 секунди " + +#: ../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 "Обновяване списъка с промени ..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12451,16 +12656,14 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Дадения тест проверява, дали два пътя, ЖП линии или воднипътища се пресичат " -"на едно и също ниво, без да са свързани с общ възел." +"Проверка дали два автомобилни, железопътни или морски пътя или две сгради се " +"пресичат в един слой без да имат общ възел." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Създаване на сгради" +msgstr "Пресичащи се сгради" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12468,19 +12671,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 -#, fuzzy +#: ../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 +msgstr "Възли в една и съща позиция" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Потвърждение" @@ -12488,19 +12690,16 @@ #: ../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 "Повтарящи се линии" +msgstr "Дублирани пътища" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Този тест проверява за точки, които се намират на едно и също място." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Създаване на копие на път" +msgstr "Изриване на дублиращите се пътища" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13002,5 +13201,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Ненаименовано съединение" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -13063,5 +13262,5 @@ #, java-format msgid "Walking Papers: {0}" -msgstr "" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -13074,5 +13273,5 @@ #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" -msgstr "" +msgstr "Достигнат е краят на реда" #. Three or more ways meeting at this node. Means we have a junction. @@ -13081,5 +13280,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Възникна грешка" @@ -13161,7 +13360,7 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Add Rectified Image" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgstr "Добавяне на поправено изображение" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -13169,7 +13368,7 @@ 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 "" +msgstr "Невалиден URL на WMS или ID" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 @@ -13185,17 +13384,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 +msgstr "Изберете WMS слой" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgstr "Начало на подравняването" + +#: ../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 "" @@ -13238,19 +13437,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Активиране" - -#: ../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 "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../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 "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13260,15 +13458,18 @@ "tiles anyway?" msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +"Базовият URL
''{0}''
за този слой на WMS не завършва нито с " +"''&'', нито с ''?''.
Вероятно това ще доведе до невалидна WMS заявка. " +"
Проверете вашите настройки.
Искате ли да се изтеглят изображенита на " +"WMS въпреки всичко?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 -#, fuzzy +msgstr "Да, дръпни изображенията" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Невалидна дата" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "Невалиден URL?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13277,102 +13478,113 @@ "разделителната способност." -#: ../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 "Запис на WMS слоя във файл" -#: ../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 +msgstr "Запис на слоя WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../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 +msgstr "Четене на WMS слой" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../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 "WMS" -#: ../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 "Отворете празен WMS слой за да заредите данни от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Настройки модул WMS" -#: ../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 "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението" -#: ../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 "WMS URL" -#: ../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 "WMS URL (по подразбиране)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Въведете име на меню и WMS URL" -#: ../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 "Копиране на подразбиращите се" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Припокриващи се области" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Моля, изберете поне една линия." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "север" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "файлове TCX (*.tcx)" +msgstr "файлове WMS (*.wms)" #. * @@ -13775,5 +13987,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 "Означение" @@ -14315,7 +14527,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Бунгало" +msgstr "асфалт" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14336,8 +14547,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 "Под наем" +msgstr "метал" #. color heath @@ -14355,5 +14565,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 "гора" @@ -14366,7 +14577,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "билети за паркиране" +msgstr "павета" #. item "Ways/Track Grade 2" combo "Surface" @@ -14402,7 +14612,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "павиран път" +msgstr "чакъл" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14413,7 +14622,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "непълен" +msgstr "сбито" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14424,5 +14632,4 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" msgstr "трева" @@ -14618,4 +14825,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" @@ -14644,12 +14852,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 @@ -14697,5 +14905,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14732,5 +14940,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14794,6 +15002,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 "не" @@ -14939,6 +15148,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 "Тип" @@ -15209,7 +15418,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Пешеходна улица" +msgstr "Пешеходци" #. item "Ways/Cycleway" text "Width (meters)" @@ -15228,7 +15436,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Шипове" +msgstr "Колелета" #. item "Ways/Footway" text "Width (meters)" @@ -15520,7 +15727,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 "Оператор" @@ -15733,6 +15940,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 "Надморска височина" @@ -15754,5 +15961,5 @@ #: build/trans_presets.java:851 msgid "Edit Bollard" -msgstr "Редактирай дирек" +msgstr "Редактиране на стълб" #. item "Barriers/Bollard" label "Edit Bollard" @@ -15982,10 +16189,10 @@ #: build/trans_presets.java:1022 msgid "Turnstile" -msgstr "" +msgstr "турникет (контрол на достъпа)" #. item #: build/trans_presets.java:1023 msgid "Edit Turnstile" -msgstr "" +msgstr "редактиране на: турникет" #. item "Barriers/Turnstile" check "Bicycle" @@ -16644,7 +16851,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" @@ -16692,23 +16896,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 "Работно време" @@ -16732,5 +16936,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" @@ -16777,24 +16980,24 @@ #: 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 "" +msgstr "денонощно" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -16807,24 +17010,24 @@ #: 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 "" +msgstr "понеделник-петък 08:30-20:00" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -16837,24 +17040,24 @@ #: 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 "" +msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00" #. group "Bicycle" @@ -16886,5 +17089,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 "Ref номер" @@ -16904,7 +17107,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "паркинг за прехвърляне на обществен транспорт" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16918,7 +17120,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Капацитет" +msgstr "Капацитет (общ)" #. item "Car/Parking" text "Capacity (overall)" @@ -16928,12 +17129,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Места за инвалиди" +msgstr "Запазени места за жени" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Места за инвалиди" +msgstr "Запазени места за родители" #: build/trans_presets.java:1400 @@ -17135,5 +17334,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Навес" @@ -17518,7 +17717,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Стоп" +msgstr "" #. color tertiary @@ -17561,28 +17759,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "китайска" +msgstr "схема" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Област за сваляне" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Поставяне" +msgstr "място" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Град (над 100 000)" +msgstr "град" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "местна" +msgstr "район" #. item "Tourism/Other Information Points" text "Name" @@ -17598,5 +17791,5 @@ #: build/trans_presets.java:1724 build/trans_presets.java:1747 msgid "Routes shown for:" -msgstr "" +msgstr "Показани са пътища за:" #. item "Tourism/Map" check "Hiking" @@ -17610,7 +17803,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Планинска туристическа пътека" +msgstr "Планинско колоездене" #. item "Tourism/Map" check "Mountainbiking" @@ -17624,7 +17816,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "ЖП стрелка" +msgstr "Колоездене" #. item "Tourism/Map" check "Riding" @@ -17632,5 +17823,5 @@ #: build/trans_presets.java:1730 build/trans_presets.java:1753 msgid "... other transportation modes possible" -msgstr "" +msgstr "... възможни са други способи за придвижване" #. item "Tourism/Map" label "... other transportation modes possible" @@ -17641,13 +17832,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Граничен контрол" +msgstr "Съдържание на таблото" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "начинаещ" +msgstr "табела" #: build/trans_presets.java:1737 @@ -17664,42 +17853,36 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "земеползване" +msgstr "растения" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Водач" +msgstr "Упътване" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Информация" +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 "По-подробно описание" +msgstr "По-точно описание" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Аудио" +msgstr "Аудио напътствия" #. #: build/trans_presets.java:1775 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "Аудио-напътствия по мобилен телефон?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Телефонен номер" +msgstr "Тел. номер" #. item "Tourism/Audioguide" text "Phone number" @@ -18023,5 +18206,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18055,5 +18238,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19179,6 +19362,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 "Религия" @@ -19187,66 +19370,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 "Будизъм" -#: 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 "Християнство" -#: 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 "Индуизъм" -#: 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 "Юдаизъм" -#: 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 "Мусулманство" -#: 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 "Сикхизъм" -#: 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 "Спиритуализъм" -#: 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 "Даосизъм" -#: 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 "Зороастризъм" -#: 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 "Конфесия" @@ -19255,76 +19438,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 "Англиканска" -#: 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 "Баптизъм" -#: 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 "Католическо" -#: 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 "Евангелска" -#: 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 "Свидетели на Йехова" -#: 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 "Лютеранство" -#: 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 "Методизъм" -#: 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 "Мормони" -#: 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 "Православие" -#: 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 "Петдесетници" -#: 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 "Пресвитериани" -#: 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 "Протестантизъм" -#: 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 "Кваркери" -#: 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 "Шийти" -#: 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 "Сунити" @@ -19656,5 +19839,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 "Забележка" @@ -19679,5 +19862,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 "Монети" @@ -19685,5 +19868,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 "Банкноти" @@ -19691,5 +19874,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 "Електрони средства за разплата" @@ -19697,5 +19880,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 "Дебитни карти" @@ -19703,5 +19886,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 "Кредитни карти" @@ -19760,10 +19943,144 @@ msgstr "Скамейка" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Назад" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Паметник" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "няма/никой" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "място" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Цвят" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Назад" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "надолу" + +#. 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 "зеленина" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "край" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Стойност" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "място" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Брой жици" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Ловно скривалище" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Редактирай ловно скривалище" @@ -19772,30 +20089,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 "Височина" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "нисък" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "среден" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "пълен" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Скривалище" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Заключване" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Фонтан" @@ -19804,10 +20121,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Редактирай фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Питейна вода" @@ -19816,10 +20133,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Редактирай питейна вода" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Дестка ясла" @@ -19827,35 +20144,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 "Магазини" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Супермаркет" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Редактирай супермаркет" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Бунгало" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "Аптека" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Редактирай бунгало" - -#: build/trans_presets.java:2478 +msgstr "Редактиране на: аптека" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Бакалия" @@ -19863,9 +20178,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Редактирай бакалия" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Будка" @@ -19873,29 +20188,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Редактирай будка" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "Книжарница" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Редактирай автобусна спирка" - -#: build/trans_presets.java:2498 +msgstr "Редактиране на книжарница" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "Туристическа агенция" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Редактирай дърво" - -#: build/trans_presets.java:2504 +msgstr "Редактиране на туристическа агенция" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Автомат за стоки" @@ -19903,5 +20216,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Редактирай автомат за стоки" @@ -19909,88 +20222,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 "билети за обществен транспорт" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "карта на обществен транспорт" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "билети за паркиране" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "храна" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "сладки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "цигари" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "храна за животни" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "вестници" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "играчки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "пощенски марки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-карти" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "телефонни ваучери" -#: 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 "презервативи" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "тампони" -#: 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 "Месарница" @@ -19998,9 +20311,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Редактирай месарница" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Фурна" @@ -20008,9 +20321,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Редактирай фурна" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Цветарски магазин" @@ -20018,18 +20331,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Редактирай цветарски магазин" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Био магазин" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Редактирай био магазин" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Алкохол" @@ -20037,54 +20350,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Редактиране магазин за алкохол" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Напитки" #. 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 "Компютри" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Редактирай компютърен магазин" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Електроника" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Редактирай магазин за електроника" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Аудио HiFi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Редактирай магазин за Аудио HiFi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Мебелен магазин" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Редактирай мебелен магазин" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Градински център" @@ -20092,9 +20405,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Редактирай градински център" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Железария" @@ -20102,9 +20415,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Редактирай железария" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Магазин \"Направи си сам\"" @@ -20112,54 +20425,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 "Книжарница" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Редактирай книжарница" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Фризьорски салон / козметика" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Редактирай фризьорски салон / козметика" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Обувки" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Редактирай магазин за обувки" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Играчки" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Редактирай магазин за играчки" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Видео" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Редактирай Видео-магазин" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Химическо чистене" @@ -20167,9 +20480,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Редактирай химическо чистене" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Пералня" @@ -20177,9 +20490,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Редактирай пералня" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Туристически стоки (за активен отдих)" @@ -20187,32 +20500,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Редактирай мазизин за туристически стоки" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Спортни стоки" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Редактирай магазин за спортни стоки" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Оптика" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Редактирай оптика" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Пари" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Банка" @@ -20220,14 +20533,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Редактирай банка" -#: 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 "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Обмяна на валута" @@ -20235,5 +20548,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Редактирай обмяна на валута" @@ -20241,15 +20554,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Редактирай банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Здраве" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Доктори" @@ -20257,18 +20570,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Редактирай доктори" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Стоматолог" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Редактирай стоматолигия" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Аптека" @@ -20276,5 +20589,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Редактирай аптека" @@ -20282,9 +20595,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Приготвят лекарства по рецепти" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Болница" @@ -20292,10 +20605,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Редактирай болница" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Пункт за връзка със спешна помощ" @@ -20304,5 +20617,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Редактирай пункт за връзка със спешна помощ" @@ -20311,20 +20624,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Номер на пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Име на пункта" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Телефонен номер" #. 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 "(Използвайте международен код, като например +12-345-67890)" @@ -20332,5 +20645,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 "Ветеринар" @@ -20339,55 +20652,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Редактирай ветеринар" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Континент" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Редактирай континент" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Държава" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Редактирай държава" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Област/Щат" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Редактирай област/щат" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Област" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Редактирай област" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Графство" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Редактирай графство" @@ -20395,15 +20708,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Град (над 100 000)" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Редактирай голям град" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Град (под 100 000)" @@ -20411,10 +20724,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Редактирай град" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Квартал/предградие" @@ -20422,25 +20735,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Редактирай квартал" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Село" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Редактирай село" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Махала" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Редактирай махала" @@ -20448,5 +20761,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Местност" @@ -20454,10 +20767,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Редактирай местност" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Остров" @@ -20465,24 +20778,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Редактирай остров" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "наляво" +msgstr "Скала" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Редактирай бунгало" +msgstr "Редактиране на: скала" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Пещерен вход" @@ -20490,10 +20801,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Редактиране пещерен вход" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Връх" @@ -20501,10 +20812,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Редактиране връх" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Ледник" @@ -20512,10 +20823,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Редактиране ледник" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Вулкан" @@ -20523,70 +20834,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Редактиране вулкан" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Граници" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Национална" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Редактирай национална граница" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Административна" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Редактирай административна граница" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Гражданска" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Редактирай гражданска граница" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Политическа" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Редактирай политическа граница" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Национален парк" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Редактирай граница национален парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Земеползване" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Дърво" @@ -20595,15 +20906,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Редактирай дърво" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Ботаническо название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Гора" @@ -20612,5 +20923,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Редактирай гората" @@ -20618,17 +20929,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 "иглолистен" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "широколистен" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "смесен" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Гора" @@ -20637,14 +20948,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Редактирай гора" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Природен резерват" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Редактирай природен резерват" @@ -20652,25 +20963,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Сипей" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Редактирай сипей" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Шубрак" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Редактирай шубрака" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Скалист склон" @@ -20678,10 +20989,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Редактирай скалист склон" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Пустош" @@ -20689,5 +21000,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Редактиране пустош" @@ -20695,5 +21006,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Двор ферма" @@ -20702,45 +21013,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Редактирай двор ферма" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Обработваема земя" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Редактирай обработваема земя" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Поляна" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Редактиране поляна" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Лозе" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Редактирай лозе" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Общинска земя" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Редактирай общинска земя" @@ -20748,25 +21059,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Градина" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Редактирай градина" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Трева" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Редактирай трева" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Зелено село" @@ -20774,10 +21085,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Редактирай зелено селище" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Общи" @@ -20785,20 +21096,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Редактирай общи" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Парк" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Редактирай парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Спортна площадка" @@ -20806,5 +21117,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Редактирай спортна площадка" @@ -20812,15 +21123,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Жилищна зона" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Редактирай жилищна зона" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Църковно гробище" @@ -20828,9 +21139,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Редактирай църковно гробище" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Гробище" @@ -20838,39 +21149,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Редактирай гробище" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Търговия на дребно" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Редактирай търговия на дребно" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Търговия" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Редактирай търговия" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Промишленост" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Редактирай промишленост" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Железопътен път" @@ -20878,15 +21189,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Редактирай ЖП" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Военен" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Редакирай военна земя" @@ -20894,55 +21205,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Строителна площадка" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Редактирай строителна площадка" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Индустриални развалини" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Редактирай ундустриални развалини" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Зелени площи" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Редактирай зелени площи" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Сметище" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Редактирай сметище" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Кариера" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Редактирай кариера" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Мултиполигон" @@ -20952,5 +21263,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 "Редактиране мултиполигон" @@ -20959,10 +21270,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "външен сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "вътрешен сегмент" @@ -20970,5 +21281,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Ограничения при завиване" @@ -20977,5 +21288,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Редактиране на ограничения при завиване" @@ -20983,34 +21294,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Ограничения" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "забранен ляв завой" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "забранен десен завой" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "забранено напред" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "забранен обратен завой" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "само десен завой" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "само ляв завой" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "само направо" @@ -21019,15 +21330,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "от път" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "през точка или път" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "до път" @@ -21035,5 +21346,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Маршрут" @@ -21042,5 +21353,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Редактиране маршрут" @@ -21048,5 +21359,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Тип маршрут" @@ -21054,5 +21365,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21118,5 +21429,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 @@ -21125,17 +21436,17 @@ msgstr "велосипед" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "автобус" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "път" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "ферибот" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ски" @@ -21188,5 +21499,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 @@ -21195,13 +21506,13 @@ msgstr "пеш" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "туристически маршрут" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "трамваен маршрут" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "обиколка" @@ -21215,10 +21526,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Описание на символ" @@ -21226,31 +21537,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Мрежа" #. 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 "предложен" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "алтернативен" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "временен" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "връзка" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Цвят (hex)" @@ -21259,30 +21570,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "сегмент от маршрут" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "сегмент напред" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "точка за спиране" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "точка за спиране напред" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "точка за спиране назад" @@ -22049,5 +22360,5 @@ #: build/trans_style.java:542 msgid "motorroad" -msgstr "" +msgstr "автомобилен път" #. color street @@ -24435,76 +24746,4 @@ msgstr "исторически" -#. 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 "зеленина" - #. color green #. @@ -25325,5 +25564,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Ненаименуван и некласифициран път" #. way : W : highway == unclassified && name != * @@ -25472,102 +25711,51 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}" +#. 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 "Всички линии бяха празни" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Обединяване точки от различни релации?" + +#~ msgid "Merge Anyway" +#~ msgstr "Сливане въпреки всичко" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, " -#~ "информирайте за тази грешка." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Няма отворени документи. Няма какво да се съхранява." - -#~ msgid "Change {0} {1}" -#~ msgstr "Промени {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Изтриване {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Премахване на члена {0} {1} от връзката" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Не може да се отвори директорията с предпочитания: {0}" - -#~ msgid "nodes" -#~ msgstr "точки" - -#~ msgid "ways" -#~ msgstr "линии" - -#~ msgid "relations" -#~ msgstr "връзки" - -#~ msgid "changesets" -#~ msgstr "набори от промени" - -#~ msgid "Delete Layer" -#~ msgstr "Изтриване на слой" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Наистина ли искате да изтриете слой ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Изтриване на всички" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Изтриване слой {0} от {1}" - -#~ msgid "Authors: {0}" -#~ msgstr "Автори: {0}" - -#~ msgid "Public" -#~ msgstr "Публична" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Избрано така прави вашата следа публичка в openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "ТОВА Е ЕКСПЕРИМЕНТАЛНО. Записвайте вашата работа и проверявайте преди " -#~ "качване." - -#~ msgid "Continue anyway" -#~ msgstr "Продължи" - -#~ msgid "Copy Default" -#~ msgstr "Копирай стойностите по подразбиране" - -#~ msgid "Edit Information Office" -#~ msgstr "Редактиране на информационен пункт" - -#~ msgid "Map Type" -#~ msgstr "Тип карта" - -#~ msgid "map" -#~ msgstr "карта" - -#~ msgid "citymap" -#~ msgstr "карта на града" - -#~ msgid "hikingmap" -#~ msgstr "карта туристически маршрути" - -#~ msgid "bicyclemap" -#~ msgstr "карта на веломаршрути" - -#~ msgid "Board Type" -#~ msgstr "Тип табло" - -#~ msgid "board" -#~ msgstr "информативна дъска" +#~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, " +#~ "въпреки това?" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..." + +#~ msgid "Unknown version" +#~ msgstr "Неизвестна версия" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Версията липсва от OSM данните." + +#~ msgid "Found element in non-way." +#~ msgstr "Намерен е елемент извън път." + +#~ msgid " has zero ref" +#~ msgstr "към няма обръщения ref." + +#~ msgid "Found element in non-relation." +#~ msgstr "Открит е маркер извън релация." + +#~ msgid "Ill-formed node id" +#~ msgstr "Неправилен код на точка" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -25610,4 +25798,7 @@ #~ msgstr "Прекъсване..." +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра." + #~ msgid "position" #~ msgstr "позиция" @@ -25654,4 +25845,7 @@ #~ msgid "Object" #~ msgstr "Обект" + +#~ msgid "Authors: {0}" +#~ msgstr "Автори: {0}" #~ msgid "Layers: {0}" @@ -25678,4 +25872,7 @@ #~ msgstr "моя версия:" +#~ msgid "Delete {1} {0}" +#~ msgstr "Изтриване {1} {0}" + #~ msgid "Email" #~ msgstr "Е-поща" @@ -25689,4 +25886,19 @@ #~ msgid "Charge" #~ msgstr "Такса" + +#~ msgid "bicyclemap" +#~ msgstr "карта на веломаршрути" + +#~ msgid "board" +#~ msgstr "информативна дъска" + +#~ msgid "citymap" +#~ msgstr "карта на града" + +#~ msgid "hikingmap" +#~ msgstr "карта туристически маршрути" + +#~ msgid "map" +#~ msgstr "карта" #~ msgid "Drawbridge" @@ -25769,4 +25981,7 @@ #~ "ограничения, ако има съмнения, по-добре не използвайте." +#~ msgid "Copy Default" +#~ msgstr "Копирай стойностите по подразбиране" + #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -25861,4 +26076,7 @@ #~ "\n" #~ "{0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Не може да се отвори директорията с предпочитания: {0}" #~ msgid "" @@ -25881,10 +26099,29 @@ #~ msgstr "Неизвестно файлово разширение." +#~ msgid "No document open so nothing to save." +#~ msgstr "Няма отворени документи. Няма какво да се съхранява." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, " +#~ "информирайте за тази грешка." + #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Някои от точките са (почти) на една права" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация." + #~ msgid "Data Layer" #~ msgstr "Слой с данни" +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Избрано така прави вашата следа публичка в openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Публична" + #~ msgid "Import TCX file as GPS track" #~ msgstr "Импортиране на TCX файл като GPS следа" @@ -25892,7 +26129,4 @@ #~ msgid "Import TCX File..." #~ msgstr "Импортиране на TCX Файл..." - -#~ msgid "end" -#~ msgstr "край" #~ msgid "Validate" @@ -25905,11 +26139,4 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Мащабиране: с колелцето на мишката или двойно щракване. Преместване на " -#~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." #~ msgid "Select Tableau d'Assemblage" @@ -25930,6 +26157,17 @@ #~ msgstr "Основен" +#~ msgid "Delete Layer" +#~ msgstr "Изтриване на слой" + #~ msgid "Delete and Download" #~ msgstr "Изтриване и Зареждане" + +#~ msgid "Continue anyway" +#~ msgstr "Продължи" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "ТОВА Е ЕКСПЕРИМЕНТАЛНО. Записвайте вашата работа и проверявайте преди " +#~ "качване." #~ msgid "Move Down" @@ -25978,4 +26216,13 @@ #~ msgid "The following errors occured during mass download:" #~ msgstr "Следните грешки възникнаха при масово сваляне:" + +#~ msgid "Edit Information Office" +#~ msgstr "Редактиране на информационен пункт" + +#~ msgid "Map Type" +#~ msgstr "Тип карта" + +#~ msgid "Board Type" +#~ msgstr "Тип табло" #~ msgid "Edit Drawbridge" @@ -26065,4 +26312,16 @@ #~ msgstr "Липсва примитив." +#~ msgid "Change {0} {1}" +#~ msgstr "Промени {0} {1}" + +#~ msgid "ways" +#~ msgstr "линии" + +#~ msgid "nodes" +#~ msgstr "точки" + +#~ msgid "changesets" +#~ msgstr "набори от промени" + #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " @@ -26081,2 +26340,20 @@ #~ "Възникна грешка при въстановяването на бекъп файла.
Грешката е: " #~ "
{0}" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}" + +#~ msgid "Delete all" +#~ msgstr "Изтриване на всички" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Наистина ли искате да изтриете слой ''{0}''?" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Изтриване слой {0} от {1}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Премахване на члена {0} {1} от връзката" + +#~ msgid "relations" +#~ msgstr "връзки" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 17594) +++ /applications/editors/josm/i18n/po/cs.po (revision 17595) @@ -8,7 +8,7 @@ "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-18 14:24+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-12 08:13+0000\n" +"Last-Translator: Jezevec \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:07+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 "Pomoc" -#: ../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 "Projekce {0} nemohla být aktivována. Používam Mercator." -#: ../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,55 +103,52 @@ #: ../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 "Chyba" -#: ../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] "Máte neuložené změny. Zahodit změny a pokračovat?" -msgstr[1] "Máte neuložené změny. Zahodit změny a pokračovat?" -msgstr[2] "Máte neuložené změny. Zahodit změny a pokračovat?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?" +msgstr[1] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" +msgstr[2] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Neuložené změny" -#: ../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 "Uložit a ukončit" -#: ../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 "Neuložit změny a ukončit" -#: ../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 @@ -158,11 +157,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 @@ -176,20 +176,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 "Zrušit" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{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 @@ -206,16 +206,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 @@ -245,15 +245,17 @@ msgstr "Varování" -#: ../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 "Ignoruji poškozený soubor z URL: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Nemohu přečíst soubor ''{0}''. Chyba je:
{1}" +msgstr "Nelze přečíst soubor ''{0}''.
Chyba:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -340,5 +342,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 "Pluginy" @@ -353,22 +355,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s " -"historií pro OSM element pravděpodobně skončí chybou. Základní URL API je: " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s " -"historií pro OSM element pravděpodobně skončí chybou. Základní URL API je: " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -479,9 +475,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 @@ -515,6 +511,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 @@ -533,11 +529,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 "Informace" @@ -559,5 +555,5 @@ msgstr "Vyberte minimálně 3 uzly" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -568,10 +564,10 @@ "{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 "Narušení schopností API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -581,5 +577,5 @@ "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -590,9 +586,9 @@ "Délka hodnoty je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Selhal předpoklad" -#: ../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}" @@ -648,26 +644,22 @@ msgstr "Není žádný konflikt, na který by se mohlo přiblížit" -#: ../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 "Spojit cesty" -#: ../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 "Spojit více cest do jedné" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Prosím zvolte minimálně dvě cesty ke spojení" - -#: ../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 "Spojit cesty patřící do jiné relace?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Přesto zkombinovat" -#: ../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 " @@ -675,13 +667,13 @@ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Změnit směr ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Otočit a zkombinovat" -#: ../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 " @@ -691,30 +683,18 @@ "orientaci?" -#: ../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 "Zadej hodnoty pro všechny konflikty" - -#: ../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 "Vyřešit konflikty" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Kombinovat {0} cesty" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Všechny cesty byli prázdné" - -#: ../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 "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Kombinovat {0} cesty" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Prosím zvolte minimálně dvě cesty ke spojení" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -769,5 +749,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 "Smazat" @@ -777,15 +757,15 @@ msgstr "Smazat označené objekty" -#: ../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 "Přepsat" -#: ../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 "Soubor již existuje. Chcete jej přepsat ?" @@ -814,10 +794,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}" @@ -848,5 +828,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 @@ -889,7 +869,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Všechny obrázky" +msgstr "Všechny formáty" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1028,1069 +1007,25 @@ msgstr "Sloučit aktuální vrstvu do jiné vrstvy" -#: ../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 "Spojit uzly" -#: ../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 "Spoj uzly do nejstaršího" -#: ../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 "Zvolte minimálně dva uzly ke spojení" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Spojit uzly s různými členství v relaci?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Přesto sloučit" - -#: ../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 "" -"Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Spojit {0} uzly" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Sloučit výběr" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Sloučit vybrané prvky do jiné vrstvy" - -#: ../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 "Zrcadlit" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Zrcadlit vybrané body a cesty." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Zvolte minimálně jeden uzel nebo cestu" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "nahoru" - -#: ../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 "Přesunout objekty {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "dolů" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "vlevo" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "vpravo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Přesunout {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Přesunutí objektů {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 "Nemohu přesouvat objekty mimo svět." - -#: ../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 "Nový" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Vytvořit novou mapu" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Otevřít..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Otevřít soubor." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Otevřít soubor." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Neznámá role ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Otevřít z umístění..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Otevřít soubor." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Oddělit vrstvu" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Zadejte URL ke stažení:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Stáhnout umístění" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL ke stažení" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ortogonalizovat tvar" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Povoleny pouze dva uzly" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Výběr se musí skládat pouze z cest" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." - -#: ../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 "Vybrán pouze jeden uzel" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ortogonalizovat" - -#: ../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 "Vložit" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Vložit ze schránky" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Vložit Popisky" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Nahrávám {0}" -msgstr[1] "Nahrávám {0}" -msgstr[2] "Nahrávám {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Obnovit {0} prvků" -msgstr[1] "Obnovit {0} prvků" -msgstr[2] "Obnovit {0} prvků" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Nastavení..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Otevřít globální nastaveni" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Předvolby" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Zrušit vrácení" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Vrátit zpět poslední vrácenou akci" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Přejmenovat vrstvu" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Také přejmenovat soubor" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Nemohu přejmenovat soubor ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Otočit cesty" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Otočit směr všech zvolených cest" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Zvolte minimálně jednu cestu." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Otočit cesty" - -#: ../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 "Uložit" - -#: ../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 "Uložit aktuální data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Soubor {0} již existuje. Přepsat ?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "Nenalezen žádný exportér! Nic nebylo uloženo." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Prázdný dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokument neobsahuje žádná data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Přesto uložit" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikty" - -#: ../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 "" -"Jsou zde stále nevyřešené konflikty. Konflikty nebudou uloženy a budou " -"vyřešeny, jako by byly všechny odmítnuty. Pokračovat?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Zamítnout konflikty a uložit" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Uložit OSM soubor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Uložit GPX soubor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Ulož vrstvu" - -#: ../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 "Uložit jako..." - -#: ../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 "Uložit aktuální data do nového souboru" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Vybrat vše" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Vybrat všechny nesmazané objekty v datové vrstvě. Vybere také neúplné " -"objekty." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Zobrazit zprávu o stavu" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Zobrazit zprávu o stavu s užitečnými informacemi, které se mohou přiložit k " -"chybovému hlášení" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Nápověda: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Zpráva o stavu" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Zkopírovat do schránky a zavřít" - -#: ../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 "Zavřít" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Rozdělit cestu" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Rozdělit cestu zvoleným uzlem" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Tento výběr nemůže být použit k rozdělení." - -#: ../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] "Zvolený uzel není uprostřed žádné cesty." -msgstr[1] "Zvolené uzly nejsou uprostřed žádné cesty." -msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty." - -#: ../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] "Více než jedna cesta obsahuje vybraný uzel. Vyberte také cestu." -msgstr[1] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." -msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Zvolené uzly nesdílejí stejnou cestu." - -#: ../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] "Označená cesta neobsahuje vybraný uzel." -msgstr[1] "Označené cesty neobsahují vybraný uzel." -msgstr[2] "Označené cesty neobsahují vybrané uzly." - -#: ../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 "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty." - -#: ../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 "" -"Cesta nemůže být rozdělena ve zvolených bodech. (Tip: Zvolte body uprostřed " -"cesty.)" - -#: ../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 "Rozdělit cestu {0} do {1} částí" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Zavírám sadu změn..." - -#: ../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 "Zavírám sadu změn..." - -#: ../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 "Otevírám sadu změn..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Zavírám sadu změn..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Vypnout/Zapnout GPX linie" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Vykreslovat spojnice mezi GPS body" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Zapnout/Vypnout globální nastavení ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Rozpojit cesty" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Zduplikovat uzly používané více cestami." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Tento uzel není přilepen k ničemu jinému." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Žádný z těchto uzlů není připojen na něco jiného." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Žádný z uzlů v této cestě není připojen na něco jiného." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Tento výběr nelze použít pro oddělení uzlů" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Vyberte buď:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Jeden otagovaný uzel, nebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Jeden uzel používaný více než jednou cestou, nebo" - -#: ../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 "" -"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" - -#: ../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 "" -"* Jednu cestu s jedním, nebo více uzly používanými ve více než jedné cestě, " -"nebo" - -#: ../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 "" -"* Jednu cestu a jeden nebo více jejích uzlů používaných ve více než jedné " -"cestě." - -#: ../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 "" -"Poznámka: Pokud je vybrána cesta, dostane čerstvé kopie odlepených\n" -"uzlů a tyto nové uzly budou vybrány. Jinak všechny cesty dostanou\n" -"své vlastní kopie a všechny uzly budou vybrány." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nespojený uzel" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplikovat do {0} uzlů" - -#. 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 "Duplikovat uzly {0} do {1} uzlů" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Zpět" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Vrátit poslední akci." - -#: ../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 "Odznačit vše" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Odznačit všechny objekty" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Odznačit vše (Fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Odznačit vše (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Aktualizovat data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)" - -#. 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 "Aktualizuji data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "Nenalezena aktuální datová sada" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Aktualizovat výběr" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Aktualizovat právě vybrané prvky ze serveru" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Nejsou vybrány žádné prvky pro aktualizaci." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Prázdný výběr" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Nahrát do OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Nahrát všechy změny na OSM server." - -#: ../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 "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Žádné změny k nahrání." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synchronizovat pouze {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 "Synchronizovat celý dataset" - -#: ../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 "" -"Aktualizace selhala, protože na serveru je novější " -"verze jednoho z vašich
bodů, cest nebo relací.
Konflikt je způsoben " -"{0} s id {1},
na serveru je verze {2}, " -"vaše verze je {3}.

Klikněte {4} pro synchronizaci " -"konfliktního prvku.
Klikněte {5} pro synchronizaci " -"kompletní lokální datové sady se serverem.
Klikněte {6} " -"pro přerušení a pokračování editace.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Detekován 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 "Neočekávaná návratová hodnota. Navráceno {0}" - -#: ../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 "" -"Aktualizace selhala, protože na serveru je novější " -"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " -"{0} pro synchronizaci kompletní lokální datové sady se serverem." -"
Klikněte {1} pro přerušení a pokračování editace.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Aktualizace selhala.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Nahrándí do OSM API selhalo" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Aktualizuji prvky" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Nahrát tyto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Nahrát změny na server" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Upravit novou relaci ve vrstvě \"{0}\"" - -#: ../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 "Přidat nový uzel do již existující cesty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "Nahrát všechny změny v jednom požadavku" - -#: ../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 "" -"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " -"prvku samostatně" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Nastavení mapy" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "sada změn" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objekty k přidání:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objekty ke změnění:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objekty ke smazání:" - -#: ../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] "Objekty k přidání:" -msgstr[1] "Objekty k přidání:" -msgstr[2] "Objekty k přidání:" - -#: ../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] "Objekty ke změnění:" -msgstr[1] "Objekty ke změnění:" -msgstr[2] "Objekty ke změnění:" - -#: ../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] "Objekty ke smazání:" -msgstr[1] "Objekty ke smazání:" -msgstr[2] "Objekty ke smazání:" - -#: ../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 "Poslední změna v {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Přiblížit" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Oddálit" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Zpět" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Skok zpět." - -#: ../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 "Zvuk: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Rychleji" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Rychle vpřed" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Vpřed" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Skok vpřed" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Další značka" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Přehraj další značku" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Přehrát/Pauza" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Přehrát/Pauza audio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Předchozí značka" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Přehrát předchozí značku" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Pomaleji" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Zpomalené přehrávání" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Stahuji GPS data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Stažená GPX data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Surová GPS data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Stahuji data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" -"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "Nic nebylo importováno" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Stahuji {0} z {1} ({2} zbývá)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "Během hromadného stahování došlo k následujícím chybám:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Chyby při stahování" - -#: ../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 "" -"Ve vaší lokální datové sadě je {0} prvků, které
mohou být na " -"serveru smazány. Pokud se pokusíte pozdějí o jejich smazání " -"nebo
aktualizaci, server bude pravděpodobně reportovat
konflikt." -"

Klikněte {1} pro zjištění stavu těchto prvků
na " -"serveru.
Klikněte {2} pro ignorování.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Smazané nebo přesunuté prvky" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Režim mazání" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Smaž body nebo cesty" - -#: ../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žim: {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 "" -"Klikni pro smazání. Shift: smaže segment cesty. Alt: nemaže nepoužité uzly, " -"když mažete trasu. CTRL: smazat referenční objekty." - +#: ../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 @@ -2101,7 +1036,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 @@ -2110,6 +1046,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 @@ -2140,4 +1076,908 @@ msgstr "parameter ''{0}'' nesmí být 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 "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Spojit {0} uzly" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Sloučit výběr" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Sloučit vybrané prvky do jiné vrstvy" + +#: ../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 "Zrcadlit" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Zrcadlit vybrané body a cesty." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Zvolte minimálně jeden uzel nebo cestu" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "nahoru" + +#: ../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 "Přesunout objekty {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "dolů" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "vlevo" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "vpravo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Přesunout {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Přesunutí objektů {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 "Nemohu přesouvat objekty mimo svět." + +#: ../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 "Nový" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Vytvořit novou mapu" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Otevřít..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Otevřít soubor." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Otevírání souborů" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Otevírání souboru ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Otevřít z umístění..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Otevřít soubor." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Oddělit vrstvu" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Zadejte URL ke stažení:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Stáhnout umístění" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL ke stažení" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ortogonalizovat tvar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Povoleny pouze dva uzly" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Výběr se musí skládat pouze z cest" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." + +#: ../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 "Vybrán pouze jeden uzel" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ortogonalizovat" + +#: ../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 "Vložit" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Vložit ze schránky" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Vložit Popisky" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty." + +#: ../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 "Nastavení..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Otevřít globální nastaveni" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Předvolby" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Zrušit vrácení" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Vrátit zpět poslední vrácenou akci" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Přejmenovat vrstvu" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Také přejmenovat soubor" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Nemohu přejmenovat soubor ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Otočit cesty" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Otočit směr všech zvolených cest" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Zvolte minimálně jednu cestu." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Otočit cesty" + +#: ../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 "Uložit" + +#: ../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 "Uložit aktuální data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Soubor {0} již existuje. Přepsat ?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Nenalezen žádný exportér! Nic nebylo uloženo." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Prázdný dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Přesto uložit" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokument neobsahuje žádná data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Zamítnout konflikty a uložit" + +#: ../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 "" +"Jsou zde stále nevyřešené konflikty. Konflikty nebudou uloženy a budou " +"vyřešeny, jako by byly všechny odmítnuty. Pokračovat?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Uložit OSM soubor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Uložit GPX soubor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Ulož vrstvu" + +#: ../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 "Uložit jako..." + +#: ../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 "Uložit aktuální data do nového souboru" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Vybrat vše" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Vybrat všechny nesmazané objekty v datové vrstvě. Vybere také neúplné " +"objekty." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Zobrazit zprávu o stavu" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Zobrazit zprávu o stavu s užitečnými informacemi, které se mohou přiložit k " +"chybovému hlášení" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Nápověda: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Zpráva o stavu" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Zkopírovat do schránky a zavřít" + +#: ../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 "Zavřít" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Rozdělit cestu" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Rozdělit cestu zvoleným uzlem" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Tento výběr nemůže být použit k rozdělení." + +#: ../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] "Zvolený uzel není uprostřed žádné cesty." +msgstr[1] "Zvolené uzly nejsou uprostřed žádné cesty." +msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty." + +#: ../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] "Více než jedna cesta obsahuje vybraný uzel. Vyberte také cestu." +msgstr[1] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." +msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Zvolené uzly nesdílejí stejnou cestu." + +#: ../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] "Označená cesta neobsahuje vybraný uzel." +msgstr[1] "Označené cesty neobsahují vybraný uzel." +msgstr[2] "Označené cesty neobsahují vybrané uzly." + +#: ../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 "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty." + +#: ../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 "" +"Cesta nemůže být rozdělena ve zvolených bodech. (Tip: Zvolte body uprostřed " +"cesty.)" + +#: ../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 "Rozdělit cestu {0} do {1} částí" + +#: ../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 "Vypnout/Zapnout GPX linie" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Vykreslovat spojnice mezi GPS body" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Zapnout/Vypnout globální nastavení ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Rozpojit cesty" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Zduplikovat uzly používané více cestami." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Tento uzel není přilepen k ničemu jinému." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Žádný z těchto uzlů není připojen na něco jiného." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Žádný z uzlů v této cestě není připojen na něco jiného." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Tento výběr nelze použít pro oddělení uzlů" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Vyberte buď:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Jeden otagovaný uzel, nebo" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Jeden uzel používaný více než jednou cestou, nebo" + +#: ../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 "" +"* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" + +#: ../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 "" +"* Jednu cestu s jedním, nebo více uzly používanými ve více než jedné cestě, " +"nebo" + +#: ../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 "" +"* Jednu cestu a jeden nebo více jejích uzlů používaných ve více než jedné " +"cestě." + +#: ../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 "" +"Poznámka: Pokud je vybrána cesta, dostane čerstvé kopie odlepených\n" +"uzlů a tyto nové uzly budou vybrány. Jinak všechny cesty dostanou\n" +"své vlastní kopie a všechny uzly budou vybrány." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nespojený uzel" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplikovat do {0} uzlů" + +#. 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 "Duplikovat uzly {0} do {1} uzlů" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Zpět" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Vrátit poslední akci." + +#: ../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 "Odznačit vše" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Odznačit všechny objekty" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Odznačit vše (Fokus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Odznačit vše (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Aktualizovat data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)" + +#. 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 "Aktualizuji data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Nenalezena aktuální datová sada" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Aktualizovat výběr" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Aktualizovat právě vybrané prvky ze serveru" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Nejsou vybrány žádné prvky pro aktualizaci." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Prázdný výběr" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Nahrát do OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Nahrát všechy změny na OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Není zde žádné vrstvy pro zdrojovou vrstvu
''{0}''
které by měly " +"být sloučeny." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Žádné změny k nahrání." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synchronizovat pouze {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 "Synchronizovat celý dataset" + +#: ../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 "" +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.
Konflikt je způsoben " +"{0} s id {1},
na serveru je verze {2}, " +"vaše verze je {3}.

Klikněte {4} pro synchronizaci " +"konfliktního prvku.
Klikněte {5} pro synchronizaci " +"kompletní lokální datové sady se serverem.
Klikněte {6} " +"pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Detekován 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 "Neočekávaná návratová hodnota. Navráceno {0}" + +#: ../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 "" +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " +"{0} pro synchronizaci kompletní lokální datové sady se serverem." +"
Klikněte {1} pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Aktualizace selhala.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Nahrándí do OSM API selhalo" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Aktualizuji prvky" + +#: ../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 "Přiblížit" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Oddálit" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Zpět" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Skok zpět." + +#: ../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 "Zvuk: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Rychleji" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Rychle vpřed" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Vpřed" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Skok vpřed" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Další značka" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Přehraj další značku" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Přehrát/Pauza" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Přehrát/Pauza audio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Předchozí značka" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Přehrát předchozí značku" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Pomaleji" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Zpomalené přehrávání" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Stahuji GPS data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Stažená GPX data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Surová GPS data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Stahuji data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Nic nebylo importováno" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Stahuji {0} z {1} ({2} zbývá)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Během hromadného stahování došlo k následujícím chybám:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Chyby při stahování" + +#: ../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 "" +"Ve vaší lokální datové sadě je {0} prvků, které
mohou být na " +"serveru smazány. Pokud se pokusíte pozdějí o jejich smazání " +"nebo
aktualizaci, server bude pravděpodobně reportovat
konflikt." +"

Klikněte {1} pro zjištění stavu těchto prvků
na " +"serveru.
Klikněte {2} pro ignorování.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Smazané nebo přesunuté prvky" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Režim mazání" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Smaž body nebo cesty" + +#: ../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žim: {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 "" +"Klikni pro smazání. Shift: smaže segment cesty. Alt: nemaže nepoužité uzly, " +"když mažete trasu. CTRL: smazat referenční objekty." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2251,18 +2091,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 "Vybrat" -#: ../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 "Zvol, posuň a otáčej objekty" -#: ../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" @@ -2272,18 +2112,18 @@ msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Přesun prvků" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Přesunout je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Vrátit zpět přesun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2291,9 +2131,6 @@ "Really move them?" msgstr "" -"Přesunul jste více než {0} prvků. Přesun velkého množství prvků je často " -"chybou.\n" -"Opravdu je chcete přesunout?" - -#: ../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 "" @@ -2415,7 +2252,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objekt s daným ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2469,41 +2305,41 @@ msgstr "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Začít hledání" -#: ../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 "Nebyly nalezeny záznamy pro \"{0}\"" -#: ../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 "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../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 "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../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 "Nalezeno {0} odpovídajích výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2516,40 +2352,40 @@ "{2}" -#: ../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 "" -#: ../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 "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace" -#: ../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 "Neočekávaný token: {0}" -#: ../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 "Chybějící argument pro \"NEBO\"" -#: ../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 "Chybějící argument pro \"NOT\"" -#: ../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 "Očekávám uzavírací závorku." -#: ../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 "Chybný počet parametrů pro operátor nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2560,5 +2396,5 @@ "čísel, například nodes:10-20." -#: ../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." @@ -2595,62 +2431,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Přidat uzel" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Přidat {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relace: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Sada změn {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Sada změn {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Změnit relaci" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Odstraněno \"{0}\" pro {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Odstraněno \"{0}\" pro {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Odstraněno \"{0}\" pro {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Nastaveno {0}={1} pro {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Nastaveno {0}={1} pro {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Nastaveno {0}={1} pro {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2723,34 +2559,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] "Smazat {0} {1}" -msgstr[1] "Smazat {0} {1}" -msgstr[2] "Smazat {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] "Režim mazání" -msgstr[1] "Režim mazání" -msgstr[2] "Režim mazání" +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] "Smazat {0} {1}" -msgstr[1] "Smazat {0} {1}" -msgstr[2] "Smazat {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] "Odstranit z relace" -msgstr[1] "Odstranit z relace" -msgstr[2] "Odstranit z relace" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2764,20 +2596,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n" -"Smazat z relace?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Výběr \"{0}\" je používán v relaci \"{1}\".\n" -"Smazat z relace?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2788,5 +2616,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." @@ -2871,17 +2699,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Vyřešit {0} konfliktů v {1} objektech" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Vyřešit {0} konfliktů v {1} objektech" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Vyřešit {0} konfliktů v {1} objektech" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2891,17 +2719,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Vyřešte konflikt verzí mezi {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Vyřešte konflikt verzí mezi {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Vyřešte konflikt verzí mezi {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3039,9 +2867,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3108,5 +2936,5 @@ msgstr "V" -#: ../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 @@ -3114,23 +2942,48 @@ msgstr "Sada změn {0}" -#: ../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 "požadován parametr {0} > 0. Zadáno {1}." -#: ../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 "parameter ''{0}'' nesmí být null" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../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 "Varování: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "neočekávaný index sloupce. Zadáno {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Neočekávaný token: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Neočekávaný token: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 #, java-format @@ -3143,11 +2996,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 "" @@ -3198,9 +3056,9 @@ msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}" -#: ../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 "Cesta se stylem plochy není uzavřená." -#: ../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." @@ -3209,118 +3067,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 "Prázdný prvek v relaci." -#: ../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 "Odstraněn prvek ''{0}'' z relace." -#: ../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 "Cesta ''{0}'' s méně, než dvěmi body." -#: ../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 "Nalezena více než jedna \"from\" cesta." -#: ../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 "Nalezeno více cílových \"to\" cest." -#: ../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 "Nalezen více než jeden \"via\"." -#: ../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 "Neznámá role ''{0}''." -#: ../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 "Neznámý typ prvku pro ''{0}''." -#: ../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 "Nenazezena příchozí cesta \"from\"." -#: ../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 "Nenalezena odchozí cesta \"to\"." -#: ../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 "Nenalezen \"via\" uzel nebo cesta." -#: ../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 "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"." -#: ../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 "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../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 "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../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 "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." -#: ../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 "Styl pro omezení {0} nenalezen." -#: ../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 "Žádná použitelná role ''{0}'' pro cestu ''{1}''." -#: ../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 "Ne-cesta ''{0}'' v multipolygonu." -#: ../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 "Multipolygon ''{0}'' nemá žádnou vnější cestu." -#: ../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 "Cesty ''{0}'' a ''{1}'' se protínají." -#: ../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 "Vnitřní cesta ''{0}'' je venku." -#: ../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 "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." -#: ../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 "Styl pro vnější cestu ''{0}'' nesedí." -#: ../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 "nepopsaný" -#: ../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 "text" @@ -3346,5 +3204,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" @@ -3356,5 +3214,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" @@ -3366,5 +3224,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" @@ -3449,7 +3307,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Nelze načíst záložky.
{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3480,5 +3338,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "železnice" @@ -3512,141 +3370,34 @@ msgstr[2] "{0} prvků" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Selhalo navázání komunikace s OSM serverem {0}.\n" -"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu." - -#. 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 "neznámý" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 "" -"Aktualizace na server selhala, protože vaše " -"aktuální
datová sada nesplňuje předpoklad.
Chybová zpráva je:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 -msgid "Precondition violation" -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 "Bezpečnostní vyjímka" -#: ../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 "" -"Nepodařilo se navázat komunikaci se serverem
''{0}''.
Prosím " -"prověřte funkčnost internetového připojení." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Síťová vyjímka" -#: ../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 "" -"Nepodařilo se nahrát data na nebo stáhnout z
''{0}''
kvůli " -"problémům s přenosem dat.
Detaily(nepřeloženo): {1}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" msgstr "IO výjimka" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 "" -"Nepodařilo se navázat komunikaci se serverem
''{0}''.
DNS jméno " -"''{1}'' nelze přeložit.
Prosím prověřte URL API ve vaší konfiguraci a " -"vaše internetové připojení." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Upravit pálkové (raketové) sporty" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Neznámé jméno počítače" -#: ../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 "" -"Aktualizace selhala, protože prvek který mažete
je " -"již na serveru vymazán.

Chybová zpráva je:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Prvek byl již smazán" @@ -3865,5 +3616,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}" @@ -4247,4 +3998,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 @@ -4323,8 +4076,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 @@ -4453,5 +4206,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 "smazáno" @@ -4511,10 +4264,10 @@ #: ../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 "Ne, zrušit" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4522,7 +4275,4 @@ "yo agree?" msgstr "" -"Pro ponechání vaší lokální verze, JOSM
resetuje id {0} {1} na 0." -"
Při přístí aktualizaci na server bude přidělěno
nové id." -"
Souhlasíte s tím?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4556,4 +4306,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 @@ -4567,5 +4318,5 @@ msgstr "Prvek" -#: ../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 "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" @@ -4671,4 +4422,40 @@ msgstr "Cizí datová sada neobsahuje tag s klíčem {0}" +#: ../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 "Nezbývají žádné další konflikty značek k vyřešení" + +#: ../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 "Aplikovat" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4681,24 +4468,23 @@ msgstr "všechny" -#: ../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 "Zvolit barvu" - -#: ../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}''" @@ -4706,12 +4492,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameter ''{0}'' nesmí být null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4719,15 +4505,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "nesmazáno" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Zatím neimplementováno." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4736,17 +4522,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "z cesty" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Odstranit z relace" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikty v datech" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4772,24 +4555,8 @@ msgstr[2] "{0} relací" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Řešení konfliktů" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Vyřešit konflikty" - -#: ../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 "Aplikovat" - #: ../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 "Vložit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4804,10 +4571,75 @@ #: ../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} začátek" -msgstr[1] "{0} začátek" -msgstr[2] "{0} začátek" +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 "Odstranit vybrané členy z relace" + +#: ../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 "místo" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Nerozhodnuto" + +#. --- 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 "Role:" + +#: ../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 "Klávesa:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Hodnota" + +#: ../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 "Jednosměrka" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revize" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4834,5 +4666,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}" @@ -4865,5 +4697,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." @@ -4936,13 +4768,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 "Vrstva: {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 "Relace: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5029,5 +4861,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 "" @@ -5087,5 +4919,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 "Přidat" @@ -5135,5 +4967,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 "Relace" @@ -5228,33 +5060,27 @@ #: ../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[2] "Autor" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -#, fuzzy msgid "Select primitives submitted by this user" -msgstr "Vybrat prvky pro vybrané členy relace" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Zobrazit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Více informací o tomto přednastavení" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných " -"primitiv." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5330,5 +5156,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}" @@ -5347,9 +5173,4 @@ msgid "Child Relations" msgstr "Potomci relace" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Role:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5614,11 +5435,11 @@ msgstr "Spojený" -#: ../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 "Stáhnout odkazované relace" -#: ../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 "" @@ -5632,7 +5453,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Načíst rodičovské relace" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5755,5 +5575,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Místa" @@ -5831,8 +5651,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "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 "" "Zvětšení: Kolečko myši, dvojklik nebo Ctrl + Up/Down Posun mapy: 0 expected, got {0}" -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Nahrávám historii pro {0} s id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Nahrávám historii pro {0} s id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Nahrávám historii pro {0} s id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6768,78 +6588,74 @@ #: 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 "Název" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Verze {0} vytvořená na {1} " -"uživatelem {2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Sada změn {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Více informací o tomto přednastavení" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Sada změn {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6857,7 +6673,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Jméno ulice" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6898,12 +6713,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Vyberte prosím hodnotu" +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 "Vrstva ''{0}'' musí být v seznamu vrstev" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6945,10 +6759,9 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Opravit konflikty značek" +msgid "Unsaved data and conflicts" +msgstr "Vyřešit konflikty" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6963,8 +6776,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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 "" @@ -6981,8 +6793,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6996,7 +6807,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Neuložit změny a ukončit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7009,7 +6819,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Uložit a ukončit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7087,7 +6896,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Při nahrávání" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7096,17 +6904,152 @@ #: ../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 "Nahrát všechny změny v jednom požadavku" + +#: ../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 "" +"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " +"prvku samostatně" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Objekty k přidání:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objekty ke změnění:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objekty ke smazání:" + +#: ../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] "{0} upravený objekt:" +msgstr[1] "{0} upravené objekty:" +msgstr[2] "{0} upravených objektů:" + +#: ../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] "{0} smazaný objekt:" +msgstr[1] "{0} smazané objekty:" +msgstr[2] "{0} smazaných objektů:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání" + +#: ../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 "Vloží data do již existující sady změn {0} a následně ji uzavře" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "Použít existující sadu změn {0} a ponechat ji otevřenou" + +#: ../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 "" +"Vloží data do již existující sady změn {0} a ponechá ji otevřenou pro " +"vkládání dalších dat" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Značky sady změn {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Nahrát změny na server" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Soubor" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Nahrát tyto úpravy?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Nahrávám" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Prosím zadejte jméno umístění" + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Zrušit změny a zavřít dialog" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Nejsou vybrány žádné prvky pro aktualizaci." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7343,5 +7286,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." @@ -7399,7 +7341,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Stahuji data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7462,4 +7403,13 @@ msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" + +#: ../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 "" +"Nahrání nezpracovaných GPS dat je považováno za poškozování projektu." +"
Pokud chcete nahrát trasy, podívejte se tady:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7654,5 +7604,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 "Zvolte řádek k vymazání" @@ -8111,7 +8061,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Zobrazovat ID objektů v seznamech" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8126,7 +8075,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Zobrazovat ID objektů v seznamech" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8479,8 +8427,4 @@ msgstr "Zakázat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Klávesa:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8537,5 +8481,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 @@ -8547,42 +8491,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Přidat novou vrstvu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Smazat označenou vrstvu." - -#: ../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 "Více informací o tomto přednastavení" #. 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 "Volitelné atributy:" -#: ../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 "Použít přednastavení \"{0}\" ze skupiny \"{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 "Použít přednastavení \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "uzavřená cesta" -#: ../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 "Neznámý typ: {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 @@ -8593,15 +8535,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {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 "Chyba parsování {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 "Objekty typu {0} nejsou podporovány." -#: ../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 @@ -8612,18 +8554,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../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 "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -8650,5 +8592,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, pravděpodobně chybí některé tagy." @@ -8664,7 +8605,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 @@ -8742,5 +8680,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}" @@ -8748,5 +8686,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" @@ -8754,5 +8692,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" @@ -8774,6 +8711,6 @@ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku" -#: ../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 @@ -8783,40 +8720,40 @@ msgstr "Stahuji OSM data..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Upravit relaci #{0} ve vrstvě \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8882,10 +8819,10 @@ msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}" -#: ../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 "neočekávaný formát id získaný ze serveru, získáno ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8894,11 +8831,9 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Otevírám sadu změn..." - -#: ../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}" @@ -8906,34 +8841,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 "Otevírám sadu změn..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Otevírám sadu změn..." - -#: ../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 "Otevírám sadu změn..." - -#: ../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 " @@ -8941,44 +8860,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../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 "Zavírám sadu změn..." - -#: ../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 "Otevírám sadu změn..." - -#: ../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 "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409 +#, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." -msgstr "Zahajuji pokus {0} z {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../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}." @@ -8997,10 +8916,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 "OSM soubory komprimované pomocí bzip2" -#: ../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 "poškozený bz2 soubor." @@ -9062,6 +8981,11 @@ "
Nepoužívejte hesla která chcete utajit." +#: ../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 "Soubory z OSM serveru" @@ -9091,5 +9015,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 "OSM soubory komprimované pomocí gzip" @@ -9152,75 +9076,140 @@ msgstr "Chyba během parsování" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Neznámá verze" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "V OSM datech chybí číslo verze" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "povinný atribut ''{0}'' chybí" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "povinný atribut ''{0}'' chybí" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Neznámá verze: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "povinný atribut ''{0}'' chybí" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Nalezen element mimo cestu." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " má nulový ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Nalezen tag mimo relaci." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "Chybí atribut \"ref\" člena relace {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Chybí atribut \"type\" člena {0} relace {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Nekompletní specifikace s 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Neplatný objekt s 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Neplatná hodnota atributu \"version\" v OSM prvku s id {0}, zadáno {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Neznámá verze: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Chybí atribut \"version\" v OSM prvku s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Chybí povinný atribut \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''" + +#: ../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 "" @@ -9229,16 +9218,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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Připravuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Neplatné id uzlu" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Parsuji data historie OSM ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Připravuji data..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9285,33 +9288,43 @@ "internetu." -#: ../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}), zbývá {3} . Nahrávám {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}), zbývá {3} . Nahrávám {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}), zbývá {3} . Nahrávám {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 "Nahrávám..." + +#: ../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 "Není nic k nahrání. Nejprve musíte mít nějaká data." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9350,12 +9363,7 @@ msgstr "Stahuji Plugin {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Přeskočit stahování" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "Pro plugin {1} je třeba JOSM verze {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9367,4 +9375,9 @@ msgstr "Přeskočit stahování" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Pro plugin {1} je třeba JOSM verze {0}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9406,20 +9419,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 "Zakázat plugin" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Ponechat plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Ponechat plugin" - -#: ../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 " @@ -9429,5 +9442,9 @@ "jejich přepsání." -#: ../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 "" @@ -9436,10 +9453,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''." -#: ../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 "Dle informací z pluginu je autor {0}." -#: ../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." @@ -9447,9 +9464,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../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 "Chcete plugin zakázat ?" -#: ../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 " @@ -9459,13 +9476,13 @@ "programu." -#: ../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 "Plugin nelze odstranit. Pravděpodobně je již neaktivní." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Informace o pluginu" -#: ../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" @@ -9523,4 +9540,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 "neznámý" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9593,4 +9641,103 @@ msgstr "(Text již byl zkopírován do schránky.)" +#: ../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 "" +"Aktualizace na server selhala, protože vaše " +"aktuální
datová sada nesplňuje předpoklad.
Chybová zpráva je:
{0}" + +#: ../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 "" +"Nepodařilo se navázat komunikaci se serverem
''{0}''.
Prosím " +"prověřte funkčnost internetového připojení." + +#: ../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 "" +"Nepodařilo se nahrát data na nebo stáhnout z
''{0}''
kvůli " +"problémům s přenosem dat.
Detaily(nepřeloženo): {1}" + +#: ../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 +#, fuzzy +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 "" +"Maximální velikost hranice oblasti je 0.25 a váš požadavek byl příliš velký. " +"Vyžádejte si menší plochu, nebo použijte planet.osm" + +#: ../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 "" +"Nepodařilo se navázat komunikaci se serverem
''{0}''.
DNS jméno " +"''{1}'' nelze přeložit.
Prosím prověřte URL API ve vaší konfiguraci a " +"vaše internetové připojení." + +#: ../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 "" +"Aktualizace selhala, protože prvek který mažete
je " +"již na serveru vymazán.

Chybová zpráva je:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9660,5 +9807,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9667,5 +9814,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9674,5 +9821,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9681,5 +9828,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9688,5 +9835,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9745,40 +9892,39 @@ msgstr "Nahrát trasy na server" -#: ../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 "Popis" -#: ../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 "Prosím zadejte popis vaší trasy" -#: ../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 "Prosím zadejte tagy o vaší trase" -#: ../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}" @@ -9786,47 +9932,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 "Připojuji se..." -#: ../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 "Nahrávání přerušeno" -#: ../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 "Chyba při nahrávání na server" -#: ../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 "Nahrání GPX dat na server proběhlo úspěšně" -#: ../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 "Nahrávání selhalo. Server vrátil následující chybu: " -#: ../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 "Nahrávám GPX trasu: {0}% ({1} z {2})" -#: ../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 "Není zadán žádný popisek. Prosíme, zadejte jej." -#: ../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 "Není vybrána GPX vrstva. Nelze nahrát trasu na server." -#: ../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 "Není zadáno uživatelské jméno." -#: ../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 "Není zadáno heslo." -#: ../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 "Nahrávám GPX trasu na server" @@ -10044,5 +10190,5 @@ msgstr "Neotagované obrázky" -#: ../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 "Korelovat obrázky s GPX trasou" @@ -10056,13 +10202,13 @@ msgstr "Auto-odhad" -#: ../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 "Měli byste vybrat GPX trasu" -#: ../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 "Není vybrána GPX trasa" -#: ../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 "" @@ -10073,9 +10219,9 @@ "Očekávaný formát: {0}" -#: ../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 "Nepatné časové pásmo" -#: ../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 "" @@ -10086,65 +10232,65 @@ "Očekávaný formát: {0}" -#: ../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 "Neplatný posun" -#: ../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 "Nalezeno {0} shod s {1} v GPX trase {2}" -#: ../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 "Nahrána GPX trasa" -#: ../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 "Zvolené fotografie neobsahují informace o čase." -#: ../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 "Fotografie neobsahují informace o čase" -#: ../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 "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." -#: ../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 "GPX trasa neobsahuje časové údaje" -#: ../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 "Časová zóna: {0}" -#: ../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 "Minuty: {0}" -#: ../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 "Sekundy: {0}" -#: ../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 "{0} z {1} fotografií bylo dosazeno do GPX trasy." -#: ../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 "(Časový rozdíl {0} dnů)" -#: ../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 "Posun mezi trasou a fotografiemi: {0}m {1}s" -#: ../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 " @@ -10152,13 +10298,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 "Dosazení fotografií do trasy selhalo." -#: ../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 "Upravit časovou zónu a posun" -#: ../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 "Výchozí hodnoty" @@ -10196,5 +10342,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 "Chyba při nahrávání souboru" @@ -10223,11 +10369,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Město {0} nenalezeno, nebo není dostupné ve WMS.\n" -"Prosíme, ověřte jeho dostupnost na www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10243,13 +10387,13 @@ msgstr "Vyberte z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../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" @@ -10258,13 +10402,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 "" @@ -10380,9 +10524,9 @@ "Nejstarší soubory jsou automaticky smazány při překročení této velikosti" -#: ../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 "Přidat \"source=...\" k objektům?" @@ -10535,7 +10679,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Vybrat" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10624,5 +10767,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 "Prázdná vrstva" @@ -11573,18 +11716,18 @@ msgstr "Neznámý stav problému" -#: ../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 "Otevřít viditelné..." -#: ../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 "Otevřít pouze soubory, které jsou viditelné v tomto pohledu." -#: ../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 "Neotevřen žádný pohled - nelze určit hranice!" -#: ../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}" @@ -11595,5 +11738,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11603,9 +11746,9 @@ "mapy v nastavení." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "nastavení osmarenderu" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Spustitelný soubor Firefoxu" @@ -11616,28 +11759,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Vytvořit nový uzel." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "změna výběru" -#: ../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 "změna pohledu" -#: ../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 "potvrzovat ručně všechny akce Dálkového ovládání" -#: ../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 "Plugin umožňující ovládání JOSM z jiných aplikací." -#: ../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 "Dálkové ovládání" -#: ../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 "Nastavení pro plugin \"Remote Control\"" -#: ../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 " @@ -11649,28 +11797,35 @@ "využívající tento plugin." -#: ../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 "Povolené akce" -#: ../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 "Dálkové ovládání bylo požádáno o nahrání dat z API." -#: ../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 "Detaily požadavku: {0}" -#: ../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 "Chcete toto povolit?" -#: ../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 "Potvrdit akci dálkového ovládání" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API." + +#: ../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 "Dálkové ovládání bylo požádáno o import dat z následujícího URL:" @@ -12170,25 +12325,33 @@ "tímto nedošlo ke vzniku chyb." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Zadej hodnoty pro všechny konflikty" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Vyřešit konflikty" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Opravit konflikty značek" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Prvek odstraněn z relací" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Spojit plochy: Vymazat krátké cesty" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Uzavřená cesta" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Odstranit tagy z vnitřních cest" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funkce spojení ploch" @@ -12261,6 +12424,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 "Chyby kontroly" @@ -12270,10 +12433,10 @@ msgstr "Žádné chyby při kontrole" -#: ../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 "Mřížka" -#: ../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 "" @@ -12362,51 +12525,66 @@ msgstr "Provede kontrolu dat" -#: ../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 "Data mají chyby. Přesto nahrát?" -#: ../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 "Otevřít okno s výsledkem kontroly." -#: ../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 "Přiblížit na problém" -#: ../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 "Opravit" -#: ../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 "Opravit vybrané chyby" -#: ../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 "Ignorovat" -#: ../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 "Ignorovat zvolené chyby pro příště." -#: ../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 "Celá skupina" -#: ../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 "Jednotlivé prvky" -#: ../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 "Nic" -#: ../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 "Ignorovat celou skupinu, nebo jednotlivé prvky?" -#: ../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 "Ignoruji elementy" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Čekám 10 sekund ... " + +#: ../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 "Aktualizuji data" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12432,16 +12610,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Tento test kontroluje na přítomnost silnic, železnic a vodních cest, které " -"se kříží ve stejné vrstvě, ale nejsou spojeny společným uzlem." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Vytvořit budovy" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12449,19 +12623,18 @@ msgstr "Zkřížené cesty" -#: ../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 "Duplicitní uzly" -#: ../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 "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Uzly se stejným jménem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Potvrzení" @@ -12469,19 +12642,16 @@ #: ../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 "Zduplikovat cestu" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Vytvořit duplikát cesty" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13054,5 +13224,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Nastala výjimka" @@ -13158,5 +13328,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 " @@ -13164,5 +13334,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 "Neplatná URL WMS nebo id" @@ -13180,17 +13350,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 "" @@ -13233,19 +13403,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Aktivovat" - -#: ../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 "WMS vrstva ({0}), automatické stahování v přiblížení {1}" -#: ../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 "WMS vrstva ({0}), stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13256,14 +13425,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Neplatné datum" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13271,102 +13439,113 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Načíst vrstvu WMS" -#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Nastavení pluginu WMS Plugin" -#: ../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 "Upravit seznam WMS serverů zobrazený v menu WMS pluginu" -#: ../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 "Jméno v menu" -#: ../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 "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Jméno v menu (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS URL (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Zadejte jméno v menu a WMS URL" -#: ../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 "Zkopírovat výchozí" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Překrývající se plochy" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Zvolte minimálně jednu cestu." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "sever" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TCX Soubory (*.tcx)" +msgstr "" #. * @@ -13762,5 +13941,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 "Číslo" @@ -14302,7 +14481,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Horská chata" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14323,8 +14501,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 "Půjčovna" +msgstr "" #. color heath @@ -14342,5 +14519,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 "Prales" @@ -14353,7 +14531,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkovací lístky" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14389,7 +14566,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "dlažební kostky" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14400,7 +14576,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "nekompletní" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14411,7 +14586,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "tráva" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14605,4 +14779,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" @@ -14631,12 +14806,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 "ano" #. color permissive -#. +#. #. 1 #. 40000 @@ -14684,5 +14859,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14719,5 +14894,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14781,6 +14956,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 "ne" @@ -14926,6 +15102,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 "Typ" @@ -15196,7 +15372,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Pěší zóna" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15215,7 +15390,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Jednosměrné hroty" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15507,7 +15681,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 "Operátor" @@ -15720,6 +15894,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 "Nadmořská výška" @@ -16631,7 +16805,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" @@ -16679,23 +16850,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 "Otevírací doba" @@ -16719,5 +16890,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" @@ -16764,22 +16934,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 "" @@ -16794,22 +16964,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 "" @@ -16824,22 +16994,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 "" @@ -16873,5 +17043,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 "Číslo záchodu" @@ -16891,7 +17061,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "park and ride" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16905,7 +17074,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapacita" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16915,12 +17083,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Místa pro vozíčkáře" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Místa pro vozíčkáře" +msgstr "" #: build/trans_presets.java:1400 @@ -17122,5 +17288,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Přístřešek" @@ -17505,7 +17671,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17548,28 +17713,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "čínská" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Stáhnout plochu" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Vložit" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Velkoměsto" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "místní" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17597,7 +17757,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "horská turistická stezka" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17611,7 +17770,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "paralelní pomocná dráha" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17628,13 +17786,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Hraniční kontrola" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "pro začátečníky (zelená)" +msgstr "" #: build/trans_presets.java:1737 @@ -17651,31 +17807,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "využití oblasti (landuse)" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Rozcestník (pěší)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informace" +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 "Bližší popis" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Zvuk" +msgstr "" #. @@ -17686,7 +17837,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefonní číslo" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18010,5 +18160,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18042,5 +18192,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19166,6 +19316,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 "Náboženství" @@ -19174,66 +19324,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 "bahá'í" -#: 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 "budhistické" -#: 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 "křesťanské" -#: 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 "hindské" -#: 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 "džinistické" -#: 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 "židovské" -#: 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 "muslimské" -#: 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 "" -#: 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 "spiritualistické" -#: 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 "taoistické" -#: 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 "Unitářské" -#: 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 "zoroastristické" -#: 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 "Vyznání" @@ -19242,76 +19392,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 "anglikánské" -#: 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 "baptistické" -#: 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 "katolické" -#: 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 "evangelické" -#: 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 "svědkové Jehovovi" -#: 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 "luteránské" -#: 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 "metodistické" -#: 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 "mormonské" -#: 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 "pravoslavné" -#: 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 "pentekostalistické" -#: 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 "presbyteriánské" -#: 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 "protestantské" -#: 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 "kvakerské" -#: 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 "ší'itské" -#: 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 "sunnitské" @@ -19643,5 +19793,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 "Poznámka" @@ -19666,5 +19816,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 "Mince" @@ -19672,5 +19822,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 "Bankovky" @@ -19678,5 +19828,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 "Elektronické peněženky nebo kreditní karty." @@ -19684,5 +19834,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 "Debetní karty" @@ -19690,5 +19840,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 "Kreditní karty" @@ -19747,10 +19897,144 @@ msgstr "Lavička" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Zpět" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Památník" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "nic" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "místo" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Barva" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Zpět" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "dolů" + +#. 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 "zeleň" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "konec" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Hodnota" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "voda" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Počet drátů tvořících vodič" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Posed" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Upravit posed" @@ -19759,30 +20043,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 "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "nízká" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "střední" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "plná" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Úkryt" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Uzamknutelný" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontána" @@ -19791,10 +20075,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Upravit fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Pitná voda" @@ -19803,10 +20087,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Upravit pitnou vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Babybox" @@ -19814,35 +20098,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Upravit babybox" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Obchody" #. 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 "Upravit supermarket" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Horská chata" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Upravit horskou chatu" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Samoobsluha, smíšenka, večerka" @@ -19850,9 +20132,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Upravit večerku" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosek" @@ -19860,29 +20142,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Upravit kiosek" -#: 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 "Upravit zastávku autobusu" - -#: 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 "Upravit strom" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Prodejní automat" @@ -19890,5 +20170,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Upravit prodejní automat" @@ -19896,88 +20176,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Prodávané produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "lístky na městskou hromadnou dopravu" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "plány městské hromadné dopravy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkovací lístky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "jídlo" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "pití" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "krmivo pro zvířata" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefonní karty" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "poukazy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "kondomy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Zůstatkové nebo věrnostní karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Řeznictví" @@ -19985,9 +20265,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Upravit řeznictví" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Pekařství" @@ -19995,9 +20275,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Upravit pekařství" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Květinářství" @@ -20005,18 +20285,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Upravit květinářství" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Obchod se zdravou výživou" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Upravit obchod se zdravou výživou" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alkohol" @@ -20024,54 +20304,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Upravit obchod s alkoholem" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Nápoje" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Upravit obchod s nápoji" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Počítače" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Upravit obchod s počítači" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronika" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Upravit obchod s elektronikou" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Upravit obchod s hifi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Nábytek" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Upravit obchod s nábytkem" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Zahradnické centrum" @@ -20079,9 +20359,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Upravit zahradnické centrum" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Železářství" @@ -20089,9 +20369,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Upravit železářství" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Zboží pro kutily" @@ -20099,54 +20379,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Upravit obchod se zbožím pro kutily" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Papírnictví" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Upravit papírnictví" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Kadeřnictví" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Upravit Kadeřnictví" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Obuv" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuví" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Hračky" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Upravit obchod s hračkami" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Videopůjčovna/prodejna" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Upravit videopůjčovnu/prodejnu" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Čistírna" @@ -20154,9 +20434,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Upravit čistírnu" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Prádelna" @@ -20164,9 +20444,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Upravit prádelnu" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Vybavení do přírody" @@ -20174,32 +20454,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Obchod s vybavením do přírody" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Sportovní potřeby" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Upravit obchod se sportovními pořebami" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Oční optik" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Upravit oční optiku" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Finance" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banka" @@ -20207,14 +20487,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Upravit banku" -#: 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Směnárna" @@ -20222,5 +20502,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Upravit směnárnu" @@ -20228,15 +20508,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Upravit bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Zdraví" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Středisko" @@ -20244,18 +20524,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Upravit středisko" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Zubař" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Upravit zubařskou ordinaci" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Lékárna" @@ -20263,5 +20543,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Upravit lékárnu" @@ -20269,9 +20549,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Vydává léky na předpis" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Nemocnice" @@ -20279,10 +20559,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Upravit nemocnici" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Místo pro kontaktování záchranářů" @@ -20291,5 +20571,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Upravit místo pro kontaktování záchranářů" @@ -20298,20 +20578,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Číslo místa" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Jméno místa" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefonní číslo" #. 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 "(Použijte mezinárodní zápis, např. +420123456789)" @@ -20319,5 +20599,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 "Veterinář" @@ -20326,55 +20606,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Upravit veterinární ordinaci" #. 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 "Upravit kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Stát" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Upravit stát" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Země" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Upravit zemi" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Kraj" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Upravit kraj" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Okres" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Upravit okres" @@ -20382,15 +20662,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Velkoměsto" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Upravit velkoměsto" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Město" @@ -20398,10 +20678,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Upravit město" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Městský obvod, nebo městská část" @@ -20409,25 +20689,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Upravit městský obvod, nebo městská část" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Obec" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Upravit obci" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Samota" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Upravit samotu" @@ -20435,5 +20715,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Místní název" @@ -20441,10 +20721,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Editovat místní název" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ostrov" @@ -20452,24 +20732,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Upravit ostrov" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "vlevo" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Upravit horskou chatu" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Vstup do jeskyně" @@ -20477,10 +20755,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Upravit vstup do jeskyně" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Vrchol" @@ -20488,10 +20766,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Upravit vrchol" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Ledovec" @@ -20499,10 +20777,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Upravit ledovec" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Sopka" @@ -20510,70 +20788,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Upravit sopku" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Národní" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Upravit národní hranici" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrativní" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Upravit administrativní hranici" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Volební obvod" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Upravit volební obvod" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Národní park" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Upravit hranice národního parku" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Využití krajiny" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Strom" @@ -20582,15 +20860,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Upravit strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanické jméno" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Prales" @@ -20599,5 +20877,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Editovat Prales" @@ -20605,17 +20883,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 "jehličnatý" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "smíšený" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Les" @@ -20624,14 +20902,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Upravit lesní plochu" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Přírodní rezervace" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Upravit přírodní rezervaci" @@ -20639,25 +20917,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Suťoviště" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Upravit suťoviště" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Podrost" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Upravit podrost" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Travnatá pahorkatina" @@ -20665,10 +20943,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Upravit travnatou pahorkatinu" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Vřesoviště" @@ -20676,5 +20954,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Upravit vřesoviště" @@ -20682,5 +20960,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Farma" @@ -20689,45 +20967,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Upravit farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Zemědělská půda" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Upravit zemědělskou půdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Louka" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Upravit louku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vinice" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Upravit vinici" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Zahrádkářská kolonie" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Upravit zahrádkářskou kolonii" @@ -20735,25 +21013,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Zahrada" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Upravit zahradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Tráva" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Upravit travnatou plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Zelená plocha" @@ -20761,10 +21039,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Upravit zelenou plochu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "veřejná zeleň (mimo parky)" @@ -20772,20 +21050,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Upravit veřejnou zeleň" #. 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 "Upravit park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Rekreační plocha" @@ -20793,5 +21071,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Upravit rekreační plochu" @@ -20799,15 +21077,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Obytná plocha" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Upravit obytnou plochu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Malý hřbitov" @@ -20815,9 +21093,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Upravit malý hřbitov" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Hřbitov" @@ -20825,39 +21103,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Upravit hřbitov" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Obchody" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Upravit plochu s obchody" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Kanceláře" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Upravit kancelářskou plochu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Průmysl" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Upravit průmyslovou plochu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Železniční plocha" @@ -20865,15 +21143,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Upravit železniční plochu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Vojenský prostor" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Upravit vojenský prostor" @@ -20881,55 +21159,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Probíhající výstavba" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Upravit výstavbu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Zastavitelné území (Greenfield)" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Upravit zastavitelné území (Greenfield)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "skládka odpadu" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Lom" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Upravit lom" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -20939,5 +21217,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 "Upravit multipolygon" @@ -20946,10 +21224,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "vnější část" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "vnitřní část" @@ -20957,5 +21235,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Zákaz odbočení" @@ -20964,5 +21242,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Upravit zákaz odbočení" @@ -20970,34 +21248,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Omezení" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "zákaz odbočení vlevo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "zákaz odbočení vpravo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "zákaz jízdy rovně" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "zákaz otáčení" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "pouze odbočení vpravo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "pouze odbočení vlevo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "pouze jízda rovně" @@ -21006,15 +21284,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "přes uzel nebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "na cestu" @@ -21022,5 +21300,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Trasa" @@ -21029,5 +21307,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Upravit trasu" @@ -21035,5 +21313,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Typ trasy" @@ -21041,5 +21319,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21105,5 +21383,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 @@ -21112,17 +21390,17 @@ msgstr "bicykl" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "silnice" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "trajekt" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "lyžařská" @@ -21175,5 +21453,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 @@ -21182,13 +21460,13 @@ msgstr "pěší" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "turistická" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tramvajová" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "objízdná" @@ -21202,10 +21480,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Popis symbolu" @@ -21213,31 +21491,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Síť" #. 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 "navrhovaná" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternativní" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "dočasná" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "spojení" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Barva (hex)" @@ -21246,30 +21524,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "segment trasy" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "dopředný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "zpětný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "zastávka" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "dopředná zastávka" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "zpětná zastávka" @@ -24422,76 +24700,4 @@ msgstr "historické" -#. 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 "zeleň" - #. color green #. @@ -25459,9 +25665,149 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." +#. 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 "Všechny cesty byli prázdné" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Spojit uzly s různými členství v relaci?" + +#~ msgid "Merge Anyway" +#~ msgstr "Přesto sloučit" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" + +#~ msgid "Unknown version" +#~ msgstr "Neznámá verze" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "V OSM datech chybí číslo verze" + +#~ msgid "Found element in non-way." +#~ msgstr "Nalezen element mimo cestu." + +#~ msgid " has zero ref" +#~ msgstr " má nulový ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Nalezen tag mimo relaci." + +#~ msgid "Ill-formed node id" +#~ msgstr "Neplatné id uzlu" + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Data Layer" +#~ msgstr "Vrstva dat" + +#~ msgid "unnamed" +#~ msgstr "nepojmenováno" + +#~ msgid "Unknown file extension." +#~ msgstr "Neznámá přípona souboru." + +#~ msgid "Change" +#~ msgstr "Změnit" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Smazat {1} {0}" + +#~ msgid "Rotate" +#~ msgstr "Otočit" + +#~ msgid "Move" +#~ msgstr "Přesunout" + +#~ msgid "false" +#~ msgstr "nepravda" + +#~ msgid "true" +#~ msgstr "pravda" + +#~ msgid "different" +#~ msgstr "různé" + +#~ msgid "position" +#~ msgstr "pozice" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "their version:" +#~ msgstr "verze na serveru:" + +#~ msgid "resolved version:" +#~ msgstr "finální verze:" + +#~ msgid "my version:" +#~ msgstr "moje verze:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Revert" +#~ msgstr "Vrátit zpět" + +#~ msgid "Add Selected" +#~ msgstr "Přidat vybrané" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemohu se připojit na server." + +#~ msgid "There were conflicts during import." +#~ msgstr "Vznikly konflikty během importu" + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsování odezvy serveru" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontaktuji OSM server..." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Vyřešit konflikty" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM uživatelské jméno (email)" + +#~ msgid "Aborting..." +#~ msgstr "Přerušuji..." + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Upravit pozici WMS vrstvy" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Není otevřený žádný dokument, není co uložit." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Přihlašovací jméno (email) k OSM účtu." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" #~ msgid "" @@ -25472,188 +25818,4 @@ #~ "chybu." -#~ msgid "No document open so nothing to save." -#~ msgstr "Není otevřený žádný dokument, není co uložit." - -#~ msgid "Change {0} {1}" -#~ msgstr "Změnit {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Smazat {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Odstranit člena relace {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Nelze otevřít adresář s nastavením: {0}" - -#~ msgid "nodes" -#~ msgstr "body" - -#~ msgid "ways" -#~ msgstr "cesty" - -#~ msgid "relations" -#~ msgstr "vazby" - -#~ msgid "changesets" -#~ msgstr "sady změn" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?" - -#~ msgid "Delete Layer" -#~ msgstr "Smazat vrstvu" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Smazat vše" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Mazání vrstvy {0} z {1}" - -#~ msgid "Authors: {0}" -#~ msgstr "Autoři: {0}" - -#~ msgid "Public" -#~ msgstr "Veřejné" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " -#~ "nahráním na server." - -#~ msgid "Continue anyway" -#~ msgstr "Přesto pokračovat" - -#~ msgid "Edit Information Office" -#~ msgstr "Editovat turistické informační centrum" - -#~ msgid "Map Type" -#~ msgstr "Typ mapy" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "citymap" -#~ msgstr "plán města" - -#~ msgid "hikingmap" -#~ msgstr "turistická mapa" - -#~ msgid "bicyclemap" -#~ msgstr "cyklistická mapa" - -#~ msgid "Board Type" -#~ msgstr "Typ nástěnky" - -#~ msgid "board" -#~ msgstr "obecná nástěnka" - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Data Layer" -#~ msgstr "Vrstva dat" - -#~ msgid "unnamed" -#~ msgstr "nepojmenováno" - -#~ msgid "Unknown file extension." -#~ msgstr "Neznámá přípona souboru." - -#~ msgid "Change" -#~ msgstr "Změnit" - -#~ msgid "Rotate" -#~ msgstr "Otočit" - -#~ msgid "Move" -#~ msgstr "Přesunout" - -#~ msgid "false" -#~ msgstr "nepravda" - -#~ msgid "true" -#~ msgstr "pravda" - -#~ msgid "different" -#~ msgstr "různé" - -#~ msgid "position" -#~ msgstr "pozice" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "their version:" -#~ msgstr "verze na serveru:" - -#~ msgid "resolved version:" -#~ msgstr "finální verze:" - -#~ msgid "my version:" -#~ msgstr "moje verze:" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Revert" -#~ msgstr "Vrátit zpět" - -#~ msgid "Add Selected" -#~ msgstr "Přidat vybrané" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemohu se připojit na server." - -#~ msgid "There were conflicts during import." -#~ msgstr "Vznikly konflikty během importu" - -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsování odezvy serveru" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Kontaktuji OSM server..." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Vyřešit konflikty" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM uživatelské jméno (email)" - -#~ msgid "Aborting..." -#~ msgstr "Přerušuji..." - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Upravit pozici WMS vrstvy" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Přihlašovací jméno (email) k OSM účtu." - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" - #~ msgid "" #~ "Revert the state of all currently selected objects to the version " @@ -25698,4 +25860,7 @@ #~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM." #~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." #~ msgid "Oberpfalz Geofabrik.de" @@ -25734,4 +25899,7 @@ #~ "vývojáře JOSM." +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Nelze otevřít adresář s nastavením: {0}" + #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Opravdu označit tento problém jako \"hotový\"?" @@ -25755,4 +25923,7 @@ #~ msgstr "Konflikty: {0}" +#~ msgid "Authors: {0}" +#~ msgstr "Autoři: {0}" + #~ msgid "Import TCX file as GPS track" #~ msgstr "Importovat TCX soubor jako GPS trasu" @@ -25778,4 +25949,7 @@ #~ msgid "Basic" #~ msgstr "Základní" + +#~ msgid "Delete Layer" +#~ msgstr "Smazat vrstvu" #~ msgid "Add all currently selected objects as members" @@ -25788,4 +25962,18 @@ #~ "{1}" +#~ msgid "Continue anyway" +#~ msgstr "Přesto pokračovat" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " +#~ "nahráním na server." + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Veřejné" + #~ msgid "sports" #~ msgstr "Sportovní potřeby" @@ -25793,4 +25981,7 @@ #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." #~ msgid "Server does not support changesets" @@ -25853,7 +26044,4 @@ #~ msgstr "Neplatná projekce" -#~ msgid "end" -#~ msgstr "konec" - #~ msgid "Edit Drawbridge" #~ msgstr "Upravit padací most" @@ -25864,4 +26052,19 @@ #~ msgid "The following errors occured during mass download:" #~ msgstr "Následující chyby nastaly při hromadném stahování:" + +#~ msgid "Map Type" +#~ msgstr "Typ mapy" + +#~ msgid "citymap" +#~ msgstr "plán města" + +#~ msgid "hikingmap" +#~ msgstr "turistická mapa" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "bicyclemap" +#~ msgstr "cyklistická mapa" #~ msgid "Helppage missing. Create it in english." @@ -25886,4 +26089,7 @@ #~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" +#~ msgid "Edit Information Office" +#~ msgstr "Editovat turistické informační centrum" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -25895,4 +26101,10 @@ #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." + +#~ msgid "Board Type" +#~ msgstr "Typ nástěnky" + +#~ msgid "board" +#~ msgstr "obecná nástěnka" #~ msgid "Directly load TCX files from JOSM." @@ -25952,4 +26164,10 @@ #~ msgstr "Výběr je příliš velký" +#~ msgid "relations" +#~ msgstr "vazby" + +#~ msgid "ways" +#~ msgstr "cesty" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Selhala inicializace API, prosím zkuste to znovu později." @@ -25961,9 +26179,24 @@ #~ msgstr "Žádná data" +#~ msgid "Change {0} {1}" +#~ msgstr "Změnit {0} {1}" + +#~ msgid "nodes" +#~ msgstr "body" + #~ msgid "Missing primitive" #~ msgstr "Chybějící prvek" +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Odstranit člena relace {0} {1}" + +#~ msgid "changesets" +#~ msgstr "sady změn" + #~ msgid "Apply partial resolutions" #~ msgstr "Aplikovat částečná řešení" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" #~ msgid "" @@ -25979,2 +26212,16 @@ #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Neznámá přípona souboru ''{0}''" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Smazat vše" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Mazání vrstvy {0} z {1}" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 17594) +++ /applications/editors/josm/i18n/po/da.po (revision 17595) @@ -8,7 +8,7 @@ "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-18 14:18+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-10 21:25+0000\n" +"Last-Translator: Peter Brodersen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\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:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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 "Hjælp" -#: ../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 "Projiceringen {0} kunne ikke aktiveres. Benytter Mercator." -#: ../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 "Fejl" -#: ../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] "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" -msgstr[1] "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?" +msgstr[1] "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Ugemte ændringer" -#: ../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 "Gem og afslut" -#: ../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 "Smid væk og afslut" -#: ../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 "Fortryd" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{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,15 +244,17 @@ msgstr "Advarsel" -#: ../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 "Ignorerer defekt fil-URL: \"{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}" -msgstr "" +msgstr "Kunne ikke læse filen \"{0}\".
Fejlen er:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -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 "Udvidelser" @@ -470,9 +472,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 @@ -506,6 +508,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 @@ -524,11 +526,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 "Oplysninger" @@ -550,5 +552,5 @@ msgstr "Vælg venligst mindst tre punkter." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -559,10 +561,10 @@ "{0}, maksimum er {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 "Brud på API-egenskaber" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -571,5 +573,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -578,12 +580,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Brud på forudgående krav" -#: ../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}" msgstr "" +"{0} punkter i vej {1} overskrider det maksimalt tilladte antal punkter {2}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 @@ -635,77 +638,61 @@ msgstr "Ingen konflikter at zoome ind på." -#: ../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 "Sammensæt vej" -#: ../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 "Sammensæt adskillige veje til én" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Sammensæt veje med forskellige tilhørsforhold?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Sammensæt alligevel" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"De valgte veje hører til forskellige relationer. Vil du stadigvæk " +"sammensætte dem?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Skift retninger?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Vend om og sammensæt" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Vejene kan ikke sammensættes med deres nuværende retninger. Vil du vende " +"nogle af dem om?" + +#: ../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 "" +"Kunne ikke sammensætte veje (de kunne ikke sættes sammen til en enkelt række " +"af punkter)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Sammensæt {0} veje" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at sammensætte." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Sammensæt veje med forskellige tilhørsforhold?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Sammensæt alligevel" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"De valgte veje hører til forskellige relationer. Vil du stadigvæk " -"sammensætte dem?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Skift retninger?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Vend om og sammensæt" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Vejene kan ikke sammensættes med deres nuværende retninger. Vil du vende " -"nogle af dem om?" - -#: ../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 "Indtast værdier for alle konflikter." - -#: ../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 "Løs konflikter" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Sammensæt {0} veje" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Alle vejene var tomme" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Kunne ikke sammensætte veje (de kunne ikke sættes sammen til en enkelt række " -"af punkter)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -734,5 +721,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "Punkterne er ikke i en cirkel. Afbryder." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -741,4 +728,6 @@ "three nodes." msgstr "" +"Vælg venligst præcis to eller tre punkter eller én vej med præcis to eller " +"tre punkter." #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 @@ -759,5 +748,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 "Fjern" @@ -767,15 +756,15 @@ msgstr "Slet valgte objekter." -#: ../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 "Overskriv" -#: ../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 "Filen findes allerede. Overskriv?" @@ -804,10 +793,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}" @@ -828,5 +817,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" -msgstr "" +msgstr "Hent primitiver, der refererer til en af de valgte primitiver." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 @@ -838,5 +827,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 @@ -846,10 +835,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" +msgstr "Konflikt ved download" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" -msgstr "" +msgstr "({0}/{1}) Henter forældre til primitivet {2}" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 @@ -879,7 +868,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Alle billeder" +msgstr "Alle formater" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -913,5 +901,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "Eksportér GPX-fil" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 @@ -1016,1040 +1004,25 @@ msgstr "Flet det nuværende lag sammen med et andet lag" -#: ../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 "Foren punkter" -#: ../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 "Foren punkter til den ældste." -#: ../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 "Vælg mindst to punkter, der skal forenes." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Foren punkter med forskellige medlemsskaber?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Sammenflet alligevel" - -#: ../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 "" -"De valgte punkter tilhører forskellige relationer. Vil du stadigvæk " -"sammenflette dem?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Kan ikke forene punkter: Ville være nødt til at slette en vej, som stadigvæk " -"er i brug." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Foren {0} punkter" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Sammenflet det valgte" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Sammenflet de aktuelt valgte primitiver til et nyt lag" - -#: ../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 "Afspejl" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Afspejl de valgte punkter og veje" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Vælg mindst ét punkt eller vej." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "op" - -#: ../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 "Flyt objekterne {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "ned" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "venstre" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "højre" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Flyt {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Flytter objekterne {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 "Kan ikke flytte objekter ud af verden." - -#: ../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 "Ny" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Opret et nyt kort." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Åbn..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Åbn en fil" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Åbn en fil" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Ukendt rolle \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Åbn placering..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Åbn en URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separat lag" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Indtast URL, der skal hentes:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Hent lokalitet" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Hent URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Gør vinkler rette" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Kun to punkter er tilladt." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Det valgte må kun bestå af veje." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter." - -#: ../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 "Kun et punkt er valgt" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Gør vinkler rette" - -#: ../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 "Sæt ind" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Indsæt indhold af udklipsholderen." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Indsæt tags" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Tilføj tags i udklipsholderen til alle valgte elementer." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Henter {0}" -msgstr[1] "Henter {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Gendan {0} primitiver" -msgstr[1] "Gendan {0} primitiver" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Indstillinger..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Åbn en side for globale indstillinger." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Indstillinger" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Omgør" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Omgør seneste fortrydelse" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Omdøb lag" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Omdøb også filen" - -#: ../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 "Vend veje om" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Vend retningen for alle valgte veje." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Vælg mindst én vej." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Vend veje om" - -#: ../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 "Gem" - -#: ../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 "Gem nuværende data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Filen {0} eksisterer allerede. Overskriv?" - -#: ../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 "Tomt dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dette dokument indeholder intet data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Gem alligevel" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikter" - -#: ../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 "" -"Der er uløste konflikter. Konflikter vil ikke blive gemt, men vil blive " -"håndteret som om, du afviste dem alle. Fortsæt?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Afvis konflikter og gem" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Gem OSM-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Gem GPX-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Gem lag" - -#: ../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 "Gem som..." - -#: ../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 "Gem det nuværende data i en ny fil." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Vælg alt" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Vælg alle uslettede objekter i datalaget. Dette vælger også ukomplette " -"objekter." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Vis statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Hjælp: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopier til udklipsholder og luk" - -#: ../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 "Luk" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Opdel vej" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Opdel en vej ved det valgte punkt" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Det nuværende valgte kan ikke bruges til opdeling" - -#: ../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] "Det valgte punkt er ikke i midten af nogen vej." -msgstr[1] "De valgte punkter er ikke i midten af nogen vej." - -#: ../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] "" -"Der er mere end én vej, som bruger det punkt, du har valgt. Vælg også vejen." -msgstr[1] "" -"Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "De valgte punkter deler ikke samme vej." - -#: ../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] "Den valgte vej indeholder ikke det valgte punkt." -msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter." - -#: ../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 "Du skal vælge mindst to punkter for at opdele en kredsformig vej" - -#: ../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 "" -"Vejen kan ikke opdeles ved de valgte punkter. (Tip: Vælg punkter i midten af " -"vejen.)" - -#: ../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 "Opdel vejen {0} i {1} stykker" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Lukker rettesæt..." - -#: ../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 "Lukker rettesæt..." - -#: ../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 "Åbner rettesæt..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Lukker rettesæt..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Skift visning af GPX-linjer" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Tegn linjer mellem rå GPS-punkter." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Skifter den globale indstilling \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Adskil veje" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Dublet-punkter, som bruges af flere veje." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Dette punkt er ikke forbundet til noget andet." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ingen af disse punkter er fastklistret til noget andet." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ingen af denne vejs punkter er forbundet til noget andet." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Vælg enten:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Et markeret punkt, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Et punkt, som bruges af mere end én vej, eller" - -#: ../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 "* Et punkt, som bruges af mere end én vej en af disse veje, eller" - -#: ../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 "" -"* En vej, som har ét eller flere punkter, som benyttes af mere end én vej, " -"eller" - -#: ../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 "" -"* Én vej samt en eller flere af dens punkter, som benyttes af mere end én " -"vej." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Kopier ind i {0} punkter" - -#. 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 "Kopier {0} punkter ind i {1} punkter" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Fortryd" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Fortryd den sidste handling" - -#: ../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 "Fravælg alt" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Fravælg alle objekter" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Fravælg alt (fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Fravælg alt (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Opdater data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Opdaterer det nuværende datalag fra serveren (genhenter data)" - -#. 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 "" - -#: ../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 "Opdater det valgte" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Opdaterer de valgte primitiver fra serveren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Der er ingen valgte primitiver at opdatere." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Intet er valgt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Send til OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Send alle ændringer til OSM-serveren." - -#: ../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 "Der er uløste konflikter. Du skal løse disse først." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Intet at sende. Skab først noget data." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Ingen ændringer at sende." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synkronisér kun {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 "Synkronisér hele datasættet" - -#: ../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 "Der er opdaget en 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 "uventet svar. Modtog {0}" - -#: ../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 "Upload til OSM-API'et fejlede" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Opdaterer primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Send disse ændringer?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Send ændringer" - -#: ../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 "Tilføj et nyt punkt til en eksisterende vej" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angiv en kort kommentar for de ændringer, du uploader:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Indstillinger for kort" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "rettesæt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Tilføjede objekter:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Ændrede objekter:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Slettede objekter:" - -#: ../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] "Tilføjede objekter:" -msgstr[1] "Tilføjede objekter:" - -#: ../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] "Ændrede objekter:" -msgstr[1] "Ændrede objekter:" - -#: ../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] "Slettede objekter:" -msgstr[1] "Slettede objekter:" - -#: ../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 "Seneste ændring ved {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Zoom ind" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zoom ud" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Tilbage" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Hop tilbage." - -#: ../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 "Lyd: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Hurtigere" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Hurtigere fremad" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Fremad" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Hop fremad" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Næste markør" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Afspil næste markør." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Afspil/pause" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Afspil/pause lyd." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Forrige markør" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Afspil forrige markør." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Langsommere" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Langsommere fremad" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Henter GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Hent GPX-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Rå GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Henter data" - -#: ../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 "Intet data importeret." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Henter {0} af {1} ({2} tilbage)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Fejl ved download" - -#: ../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 "Slettede eller flyttede primitiver" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Slette-tilstand" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Slet punkter eller veje." - -#: ../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 "Tilstand: {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 "" -"Klik for at slette. Shift: Slet vejsegment. Alt: Slet ikke ubrugte punkter, " -"når en vej slettes. Ctrl: Slet refererende objekter." - +#: ../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 @@ -2060,7 +1033,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 @@ -2069,6 +1043,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 @@ -2099,4 +1073,885 @@ msgstr "parameteren \"{0}\" må ikke være en null-værdi" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Kan ikke forene punkter: Ville være nødt til at slette en vej, som stadigvæk " +"er i brug." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Foren {0} punkter" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Sammenflet det valgte" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Sammenflet de aktuelt valgte primitiver til et nyt lag" + +#: ../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 "Afspejl" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Afspejl de valgte punkter og veje" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Vælg mindst ét punkt eller vej." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "op" + +#: ../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 "Flyt objekterne {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "ned" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "venstre" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "højre" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Flyt {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Flytter objekterne {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 "Kan ikke flytte objekter ud af verden." + +#: ../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 "Ny" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Opret et nyt kort." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Åbn..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Åbn en fil" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Åbner filer" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Åbner filen \"{0}\" ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Åbn placering..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Åbn en URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separat lag" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Indtast URL, der skal hentes:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Hent lokalitet" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Hent URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Gør vinkler rette" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Kun to punkter er tilladt." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Det valgte må kun bestå af veje." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter." + +#: ../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 "Kun et punkt er valgt" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Gør vinkler rette" + +#: ../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 "Sæt ind" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Indsæt indhold af udklipsholderen." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Indsæt tags" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Tilføj tags i udklipsholderen til alle valgte elementer." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Indsætter {0} tag" +msgstr[1] "Indsætter {0} tags" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "til {0} primitiv" +msgstr[1] "til {0} primitiver" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Indstillinger..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Åbn en side for globale indstillinger." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Indstillinger" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Omgør" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Omgør seneste fortrydelse" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Omdøb lag" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Omdøb også filen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Kunne ikke omdøbe filen \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Vend veje om" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Vend retningen for alle valgte veje." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Vælg mindst én vej." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Vend veje om" + +#: ../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 "Gem" + +#: ../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 "Gem nuværende data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Filen {0} eksisterer allerede. Overskriv?" + +#: ../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 "Tomt dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Gem alligevel" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dette dokument indeholder intet data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Afvis konflikter og gem" + +#: ../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 "" +"Der er uløste konflikter. Konflikter vil ikke blive gemt, men vil blive " +"håndteret som om, du afviste dem alle. Fortsæt?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Gem OSM-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Gem GPX-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Gem lag" + +#: ../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 "Gem som..." + +#: ../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 "Gem det nuværende data i en ny fil." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Vælg alt" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Vælg alle uslettede objekter i datalaget. Dette vælger også ukomplette " +"objekter." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Vis statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hjælp: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopier til udklipsholder og luk" + +#: ../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 "Luk" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Opdel vej" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Opdel en vej ved det valgte punkt" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Det nuværende valgte kan ikke bruges til opdeling" + +#: ../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] "Det valgte punkt er ikke i midten af nogen vej." +msgstr[1] "De valgte punkter er ikke i midten af nogen vej." + +#: ../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] "" +"Der er mere end én vej, som bruger det punkt, du har valgt. Vælg også vejen." +msgstr[1] "" +"Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "De valgte punkter deler ikke samme vej." + +#: ../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] "Den valgte vej indeholder ikke det valgte punkt." +msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter." + +#: ../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 "Du skal vælge mindst to punkter for at opdele en kredsformig vej" + +#: ../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 "" +"Vejen kan ikke opdeles ved de valgte punkter. (Tip: Vælg punkter i midten af " +"vejen.)" + +#: ../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 "Opdel vejen {0} i {1} stykker" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Luk nuværende rettesæt" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Luk det nuværende rettesæt ..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Der er ingen rettesæt åbne." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "Intet rettesæt åbent" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Lukker rettesæt" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Skift visning af GPX-linjer" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Tegn linjer mellem rå GPS-punkter." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Skifter den globale indstilling \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Adskil veje" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Dublet-punkter, som bruges af flere veje." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Dette punkt er ikke forbundet til noget andet." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ingen af disse punkter er fastklistret til noget andet." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ingen af denne vejs punkter er forbundet til noget andet." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Vælg enten:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Et markeret punkt, eller" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Et punkt, som bruges af mere end én vej, eller" + +#: ../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 "* Et punkt, som bruges af mere end én vej en af disse veje, eller" + +#: ../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 "" +"* En vej, som har ét eller flere punkter, som benyttes af mere end én vej, " +"eller" + +#: ../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 "" +"* Én vej samt en eller flere af dens punkter, som benyttes af mere end én " +"vej." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Kopier ind i {0} punkter" + +#. 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 "Kopier {0} punkter ind i {1} punkter" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Fortryd" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Fortryd den sidste handling" + +#: ../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 "Fravælg alt" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Fravælg alle objekter" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Fravælg alt (fokus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Fravælg alt (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Opdater data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Opdaterer det nuværende datalag fra serveren (genhenter data)" + +#. 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 "" + +#: ../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 "Fandt ikke en primitiv med id {0} i det nuværende rettesæt" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Opdater det valgte" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Opdaterer de valgte primitiver fra serveren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Der er ingen valgte primitiver at opdatere." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Intet er valgt" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Send til OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Send alle ændringer til OSM-serveren." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Der er ingen lag, kildelaget
\"{0}\"
kunne flettes sammen med." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Intet at sende. Skab først noget data." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Ingen ændringer at sende." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synkronisér kun {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 "Synkronisér hele datasættet" + +#: ../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 "Der er opdaget en 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 "uventet svar. Modtog {0}" + +#: ../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 "Upload til OSM-API'et fejlede" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Opdaterer primitiv" + +#: ../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 "Zoom ind" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zoom ud" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Tilbage" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Hop tilbage." + +#: ../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 "Lyd: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Hurtigere" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Hurtigere fremad" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Fremad" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Hop fremad" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Næste markør" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Afspil næste markør." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Afspil/pause" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Afspil/pause lyd." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Forrige markør" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Afspil forrige markør." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Langsommere" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Langsommere fremad" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Henter GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Hent GPX-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Rå GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Henter data" + +#: ../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 "Intet data importeret." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Henter {0} af {1} ({2} tilbage)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Fejl ved download" + +#: ../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 "Slettede eller flyttede primitiver" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Slette-tilstand" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Slet punkter eller veje." + +#: ../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 "Tilstand: {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 "" +"Klik for at slette. Shift: Slet vejsegment. Alt: Slet ikke ubrugte punkter, " +"når en vej slettes. Ctrl: Slet refererende objekter." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2209,18 +2064,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 "Markering" -#: ../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 "Vælg, flyt og rotér objekter" -#: ../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" @@ -2229,17 +2084,17 @@ msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Flyt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Flyt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Fortryd flytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 #, java-format msgid "" @@ -2249,5 +2104,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 "" @@ -2367,7 +2222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objekt med det givne ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2419,41 +2273,41 @@ msgstr "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Start søgning" -#: ../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 "Intet resultat for \"{0}\"" -#: ../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 "Intet tilføjet til det valgte ved søgning efter \"{0}\"" -#: ../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 "Intet fjernet fra det valgte ved søgning efter \"{0}\"" -#: ../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 "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "Regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2467,40 +2321,40 @@ "{2}" -#: ../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 "" -#: ../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 "Mangler argumenter for \"eller\"." -#: ../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 "Mangler argument fro \"ikke\"." -#: ../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 "Forventede slutparentes." -#: ../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 "" @@ -2509,5 +2363,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." @@ -2544,7 +2398,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Tilføj punkt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2554,52 +2408,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relationer: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Ret {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Seneste ændring ved {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Skift relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Fjern \"{0}\" for {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Fjern \"{0}\" for {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Fjern \"{0}\" for {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Sæt {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Sæt {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Sæt {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2669,30 +2523,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] "Slet {0} {1}" -msgstr[1] "Slet {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] "Slette-tilstand" -msgstr[1] "Slette-tilstand" +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] "Slet {0} {1}" -msgstr[1] "Slet {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] "Slet fra relation" -msgstr[1] "Slet fra relation" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2706,20 +2560,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n" -"Slet fra relation?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Markeringen \"{0}\" bruges af relationen \"{1}\".\n" -"Slet fra relation?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2730,5 +2580,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." @@ -2809,17 +2659,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Løs {0} tag-konflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Løs {0} tag-konflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Løs {0} tag-konflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2829,17 +2679,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Løs versionskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Løs versionskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Løs versionskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2977,10 +2827,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3047,5 +2896,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 @@ -3053,21 +2902,46 @@ 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 "parameteren \"{0}\" må ikke være en null-værdi" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Fejl: {0}" -#: ../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 "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "uventet kolonne-indeks. Modtog {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "uventet svar. Modtog {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, java-format +msgid "version > 0 expected. Got {0}" msgstr "" @@ -3082,11 +2956,16 @@ msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\"" -#: ../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 "" @@ -3137,9 +3016,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 "En vej af typen Område er ikke lukket." -#: ../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." @@ -3148,118 +3027,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 "Tomt medlem i relation." -#: ../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 "Slettede medlem \"{0}\" i relation" -#: ../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 "Vej \"{0}\" med mindre end to punkter." -#: ../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 "Mere end én \"fra\"-vej blev fundet." -#: ../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 "Mere end én \"til\"-vej blev fundet." -#: ../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 "Mere end én \"via\" blev fundet." -#: ../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 "Ukendt rolle \"{0}\"." -#: ../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 "Ukendt medlemstype for \"{0}\"." -#: ../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 "Ingen \"fra\"-vej blev fundet." -#: ../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 "Ingen \"til\"-vej blev fundet." -#: ../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 "Intet \"via\"-punkt eller vej blev fundet." -#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../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 "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." -#: ../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 "Ikke-vej \"{0}\" i multipolygon." -#: ../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 "Ingen ydre vej for multipolygon \"{0}\"." -#: ../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 "Overlap mellem vejene \"{0}\" og \"{1}\"." -#: ../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 "Indre vej \"{0}\" er på ydersiden." -#: ../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 "utagget" -#: ../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 "tekst" @@ -3282,5 +3161,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" @@ -3291,5 +3170,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" @@ -3300,5 +3179,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" @@ -3407,5 +3286,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "jernbane" @@ -3437,129 +3316,33 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Kunne ikke oprette forbindelse til OSM-serveren {0}.\n" -"Tjek server-URL'en i dine indstillinger samt din internetforbindelse." - -#. 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 "ukendt" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Ukendt vært" -#: ../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 "Primitiven er allerede slettet" @@ -3777,5 +3560,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}" @@ -4153,4 +3936,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 @@ -4222,8 +4007,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 @@ -4348,5 +4133,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 "slettet" @@ -4406,5 +4191,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 "" @@ -4446,4 +4231,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 @@ -4457,5 +4243,5 @@ msgstr "Primitiv" -#: ../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 "" @@ -4561,4 +4347,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 "Ingen konflikter at zoome ind på." + +#: ../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 @@ -4571,24 +4393,23 @@ msgstr "alle" -#: ../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 "Vælg en farve" - -#: ../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 -#, fuzzy, java-format +#: ../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 "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4596,12 +4417,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameteren \"{0}\" må ikke være en null-værdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4609,15 +4430,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "ikke slettet" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Endnu ikke implementeret." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4626,17 +4447,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "Tag veje som" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Slet fra relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikt i data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4660,24 +4478,8 @@ msgstr[1] "{0} relationer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Skift opløsning" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Løs konflikter" - -#: ../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 "Sæt ind" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4692,9 +4494,75 @@ #: ../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} vej" -msgstr[1] "{0} veje" +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 "Fjern medlemmet i den nuværende tabelrække fra denne relation" + +#: ../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 "sted" + +#: ../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 +#, fuzzy +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 "Tast:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Værdi" + +#: ../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 "Ensrettet" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Version" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4721,5 +4589,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}" @@ -4752,5 +4620,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." @@ -4823,13 +4691,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 "Lag: {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 "Relationer: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4915,5 +4783,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 "" @@ -4972,5 +4840,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 "Tilføj" @@ -5020,5 +4888,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 "Relationer" @@ -5111,9 +4979,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] "Forfatter" -msgstr[1] "Forfatter" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5126,7 +4994,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Mere information om denne feature" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5207,5 +5074,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}" @@ -5223,9 +5090,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 "" @@ -5476,11 +5338,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 "" @@ -5494,7 +5356,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Henter indledende udvidelser" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5621,5 +5482,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Steder" @@ -5697,9 +5558,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: Musehjul eller dobbeltklik. Flyt kort: Hold højre museknap nede og " +"flyt musen. Vælg: Klik" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5748,7 +5612,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Send de nuværende indstillinger til serveren" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5781,7 +5644,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 @@ -6631,52 +6494,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 "Navn" @@ -6686,21 +6549,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 "rettesæt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Mere information om denne feature" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Seneste ændring ved {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6718,7 +6579,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Vejnavn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6759,12 +6619,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Vælg venligst en værdi" +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 "parameteren \"{0}\" må ikke være en null-værdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6808,6 +6667,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" -msgstr "" +#, fuzzy +msgid "Unsaved data and conflicts" +msgstr "Løs konflikter" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6824,5 +6684,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 "" @@ -6841,5 +6701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6853,7 +6713,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Smid væk og afslut" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6866,7 +6725,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Gem og afslut" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6944,7 +6802,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Ved upload" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6953,17 +6810,145 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Angiv en kort kommentar for de ændringer, du uploader:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Tilføjede objekter:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Ændrede objekter:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Slettede objekter:" + +#: ../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 "Send ændringer" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Filer" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Send disse ændringer?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Sender" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Indtast et navn for stedet." + +#: ../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 "Der er ingen valgte primitiver at opdatere." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7196,5 +7181,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." @@ -7252,7 +7236,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Henter data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7314,4 +7297,13 @@ msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" + +#: ../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 "" +"Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt " +"
Hvis du vil uploade traces, så kig her:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7502,5 +7494,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 "Vælg venligst rækken, der skal slettes" @@ -7960,7 +7952,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Vis objekt-ID i lister" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7975,7 +7966,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Vis objekt-ID i lister" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8336,8 +8326,4 @@ msgstr "Deaktiver" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Tast:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8394,5 +8380,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 @@ -8403,42 +8389,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Tilføj en kommentar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Slet det valgte lag." - -#: ../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 "Mere information om denne feature" #. 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 "Valgfri attributter:" -#: ../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 "Brug forudindstilling \"{0}\" af gruppe \"{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 "Brug forudindstilling \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "Ukendt type: {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 @@ -8449,15 +8433,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {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 "Fejl ved fortolkning af {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 "Elementer af typen {0} er understøttet." -#: ../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 @@ -8467,18 +8451,18 @@ msgstr[1] "Ret {0} objekter" -#: ../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 "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Ret egenskaber" @@ -8505,5 +8489,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, måske på grund af manglende tags." @@ -8519,7 +8502,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 @@ -8597,5 +8577,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}" @@ -8603,5 +8583,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" @@ -8609,5 +8589,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" @@ -8628,6 +8607,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 @@ -8637,40 +8616,40 @@ msgstr "Downloader OSM-data..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8732,10 +8711,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 "" @@ -8743,11 +8722,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 "Åbner rettesæt..." - -#: ../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}" @@ -8755,34 +8732,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 "Åbner rettesæt..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Åbner rettesæt..." - -#: ../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 "Åbner rettesæt..." - -#: ../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 " @@ -8790,44 +8751,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../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 "Lukker rettesæt..." - -#: ../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 "Åbner rettesæt..." - -#: ../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 "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Uploader..." -#: ../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}." @@ -8846,10 +8807,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 "Ugyldig bz2-fil." @@ -8909,6 +8870,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-serverfiler" @@ -8937,5 +8903,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 "" @@ -8992,74 +8958,139 @@ msgstr "Fejl ved fortolkning" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Ukendt version" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Versionsnummer mangler fra OSM-data." - -#: ../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 "Mangler obligatorisk attribut \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Ukendt version: {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 "Fandt -element i en ikke-vej" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " har nul ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Fandt -element i en ikke-relation." - -#: ../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 "Ufuldstændig -specifikation med 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 "Ugyldigt objekt med 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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Ukendt version: {0}" + +#: ../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 "Mangler obligatorisk attribut \"{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 "" @@ -9068,16 +9099,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 "Forbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Defekt id for punkt" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Forbereder OSM-data..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Forbereder data..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9123,33 +9168,43 @@ "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse." -#: ../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} tilbage. Uploader {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} tilbage. Uploader {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} tilbage. Uploader {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 "Uploader..." + +#: ../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 "Intet at sende. Skab først noget data." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9187,12 +9242,7 @@ msgstr "Henter udvidelsen {0}..." -#: ../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 "JOSM-version {0} er krævet for udvidelsen {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9204,4 +9254,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM-version {0} er krævet for udvidelsen {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9243,20 +9298,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 "Deaktivér udvidelse." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Behold udvidelse" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Behold udvidelse" - -#: ../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 " @@ -9266,5 +9321,9 @@ "til at overskrive de eksisterende udvidelser." -#: ../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 "" @@ -9272,10 +9331,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../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 "Ifølge udvidelsen medfølgende information, så er {0} forfatteren." -#: ../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." @@ -9284,9 +9343,9 @@ "fejlrapport." -#: ../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 "Skal udvidelsen deaktiveres?" -#: ../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 " @@ -9296,13 +9355,13 @@ "udvidelsen." -#: ../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" @@ -9359,4 +9418,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 "ukendt" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9431,4 +9521,88 @@ msgstr "(teksten er allerede kopieret til til din udklipsholder.)" +#: ../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 @@ -9499,5 +9673,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9506,5 +9680,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9513,5 +9687,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9520,5 +9694,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9527,5 +9701,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9584,40 +9758,39 @@ msgstr "Send sporinger" -#: ../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 "Beskrivelse" -#: ../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 "Indtast en beskrivelse af din sporing." -#: ../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 "Indtast nogle nøgleord om din sporing" -#: ../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}" @@ -9625,47 +9798,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 "Forbinder..." -#: ../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 "Opdatering afbrudt" -#: ../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 "Fejl under upload" -#: ../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 "GPX-upload lykkedes" -#: ../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 "Upload fejlede. Serveren angav følgende besked: " -#: ../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 "Sender GPX-spor: {0}% ({1} af {2})" -#: ../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 "Ingen beskrivelse er angivet. Tilføj venligst en beskrivelse." -#: ../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 "Intet GPX-lag er valgt. Kan ikke sende sporingen." -#: ../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 "Intet brugernavn er angivet." -#: ../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 "Intet kodeord er angivet." -#: ../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 "Sender GPX-spor" @@ -9884,5 +10057,5 @@ msgstr "Endnu ikke taggede billeder" -#: ../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 "Tilpas billeder med GPX-spor" @@ -9896,13 +10069,13 @@ msgstr "Automatisk gæt" -#: ../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 "Du bør vælge et GPX-spor" -#: ../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 "Intet valgt GPX-spor" -#: ../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 "" @@ -9913,9 +10086,9 @@ "Forventet format: {0}" -#: ../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 "Ugyldig tidszone" -#: ../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 "" @@ -9926,65 +10099,65 @@ "Forventet format: {0}" -#: ../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 "Ugyldig forskydning" -#: ../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 "GPX-spor hentet" -#: ../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 "Det valgte billede rummer ingen tidsangivelse" -#: ../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 "Billederne rummer ingen tidsangivelser" -#: ../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 "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." -#: ../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 "GPX-sporet har ingen tidsangivelser." -#: ../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 "Tidszone: {0}" -#: ../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 "Minutter: {0}" -#: ../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 "Sekunder: {0}" -#: ../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 "(Tidsforskel på {0} dage)" -#: ../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 "Forskydning mellem spor og billeder: {0}m {1}s" -#: ../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 " @@ -9992,13 +10165,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 "Justér tidszone og forskydning" -#: ../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 "Standardværdier" @@ -10036,5 +10209,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 "Fejl ved indlæsning af fil" @@ -10063,11 +10236,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Byen {0} blev ikke findet eller er ikke tilgængelig i WMS.\n" -"Tjek dens tilgængelighed på www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10083,13 +10254,13 @@ msgstr "Vælg fra..." -#: ../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" @@ -10098,13 +10269,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 "" @@ -10217,9 +10388,9 @@ "Ældste filer bliver automatisk slettet, når denne størrelse overskrides." -#: ../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 "Tilføj \"source=...\" til elementer?" @@ -10372,7 +10543,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Markering" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10456,5 +10626,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 "Tomt lag" @@ -11379,18 +11549,18 @@ msgstr "Ukendt status for fejlrapport" -#: ../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 "Åbn synlig..." -#: ../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 "Åbn kun filer, som er synlige i det nuværende synsfelt." -#: ../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 "Intet synsfelt åbent - kan ikke afgøre omridset!" -#: ../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}" @@ -11401,5 +11571,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11409,9 +11579,9 @@ "under indstillingerne." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender-indstillinger" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox-programfil" @@ -11422,28 +11592,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Opret nyt punkt." + +#: ../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 "skift synsfeltet" -#: ../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 "bekræft alle Fjernbetjenings-handlinger manuelt" -#: ../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 "En udvidelse, som tillader JOSM at blive styret fra andre programmer." -#: ../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 "Fjernbetjening" -#: ../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 "Indstillinger for Fjernbetjeningsudvidelsen" -#: ../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 " @@ -11452,28 +11627,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 "Tilladte handlinger" -#: ../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 "Anmod om detaljer: {0}" -#: ../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 "Vil du tillade dette?" -#: ../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 "Bekræft Fjernbetjenings-handling" -#: ../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 "" @@ -11964,25 +12145,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Indtast værdier for alle konflikter." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Løs konflikter" + #: ../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 "Fjernede element fra relationer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Sammenlæg områder: Fjern korte veje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Lukket vej" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Fjern tags fra indre veje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funktion til sammenlægning af områder" @@ -12054,6 +12243,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 "Valideringsfejl" @@ -12063,10 +12252,10 @@ msgstr "Ingen valideringsfejl" -#: ../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 "Gitter" -#: ../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 "" @@ -12156,51 +12345,65 @@ msgstr "Foretager datavalidering" -#: ../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 "Data med fejl. Send alligevel?" -#: ../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 "Åbn valideringsvindue" -#: ../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 "Zoom til problem" -#: ../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 "Ret" -#: ../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 "Ret de valgte fejl." -#: ../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 "Ignorér" -#: ../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 "Ignorér de valgte fejl næste gang." -#: ../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 "Hele gruppen" -#: ../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 "Enkelte elementer" -#: ../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 "Intet" -#: ../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 "Ignorér hele gruppen eller enkelte elementer?" -#: ../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 "Ignorerer elementer" + +#: ../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 "Gendanner vej..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12226,16 +12429,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Denne test undersøger om to veje, jernbaner eller vandveje krydser i det " -"samme lag, uden at være forbundet til samme punkt." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Opret bygninger" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12243,10 +12442,10 @@ msgstr "Krydsende veje" -#: ../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 "Dublet-punkter" -#: ../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 "" @@ -12254,10 +12453,9 @@ "sted." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Punkter med samme navn" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12265,21 +12463,16 @@ #: ../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 "Dupliker vej" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." msgstr "" -"Denne test tjekker at der ikke er nogen punkter, som ligger på præcis samme " -"sted." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Opret kopi af vej" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12852,5 +13045,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "En undtagelse opstod" @@ -12934,5 +13127,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 " @@ -12940,5 +13133,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 "Ingen gyldig WMS-URL eller id" @@ -12956,17 +13149,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 "" @@ -13007,19 +13200,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "designeret" - -#: ../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 "WMS-lag ({0}), henter automatisk til zoom {1}" -#: ../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 "WMS-lag ({0}), henter til zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13030,14 +13222,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Ugyldig dato" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13046,96 +13237,109 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Hent WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Hent WMS-lag" -#: ../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 "Fil format fejl" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Åbn et tomt WMS-lag for at hente data fra en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Indstillinger for WMS-udvidelse" -#: ../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 "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen" -#: ../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 "Navn på menu" -#: ../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 "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Navn på menu (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS-URL (standard)" -#: ../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 "Kopier standardværdi" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Overlappende områder" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Vælg mindst én vej." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of east:" +msgstr "% af bredde:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% af bredde:" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13517,5 +13721,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 "Reference" @@ -14057,7 +14261,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Feriehytte" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14078,8 +14281,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 "Udlejning" +msgstr "" #. color heath @@ -14097,5 +14299,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 "træ" @@ -14108,7 +14311,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "P-automat" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14144,7 +14346,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "toppede brosten" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14155,7 +14356,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "ufuldstændig" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14166,7 +14366,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "græs" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14360,4 +14559,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" @@ -14386,12 +14586,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 "ja" #. color permissive -#. +#. #. 1 #. 40000 @@ -14439,5 +14639,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14474,5 +14674,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14536,6 +14736,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 "nej" @@ -14681,6 +14882,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 "Type" @@ -14951,7 +15152,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Gågade" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14970,7 +15170,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pigge" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15262,7 +15461,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 "Selskab" @@ -15475,6 +15674,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 "Højde" @@ -16386,7 +16585,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" @@ -16434,23 +16630,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 "Åbningstider" @@ -16474,5 +16670,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" @@ -16519,22 +16714,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 "" @@ -16549,22 +16744,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 "" @@ -16579,22 +16774,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 "" @@ -16628,5 +16823,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 "" @@ -16646,7 +16841,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Markér som udført" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16660,7 +16854,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapacitet" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16670,12 +16863,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Handicapplads" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Handicapplads" +msgstr "" #: build/trans_presets.java:1400 @@ -16877,5 +17068,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17260,7 +17451,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17303,28 +17493,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "kinesisk" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Hent område" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Sæt ind" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "By" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "Region" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17352,7 +17537,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Bjergvandring" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17366,7 +17550,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "bygning" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17383,13 +17566,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Grænsekontrol" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "nybegynder" +msgstr "" #: build/trans_presets.java:1737 @@ -17406,7 +17587,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "brug af jord" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17417,19 +17597,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Oplysninger" +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 "Nærmere beskrivelse" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Lyd" +msgstr "" #. @@ -17440,7 +17617,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefonnummer" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17764,5 +17940,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17796,5 +17972,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18920,6 +19096,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 "Religion" @@ -18928,66 +19104,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 "bahai" -#: 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 "buddhistisk" -#: 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 "kristen" -#: 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 "hinduistisk" -#: 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 "jainistisk" -#: 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 "jødisk" -#: 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 "muslimsk" -#: 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 "spiritistisk" -#: 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 "taoistisk" -#: 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 "unitar" -#: 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 "zoroastristisk" -#: 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 "Trosretning" @@ -18996,76 +19172,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 "anglikansk" -#: 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 "baptistisk" -#: 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 "katolsk" -#: 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 "evangelisk" -#: 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 "Jehovas Vidner" -#: 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 "luthersk" -#: 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 "metodistisk" -#: 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 "mormonsk" -#: 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 "ortodoks" -#: 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 "pinsebevægelsen" -#: 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 "prebyteriansk" -#: 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 "protestantisk" -#: 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 "kvæker" -#: 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 "shiitisk" -#: 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 "sunnitisk" @@ -19397,5 +19573,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 "" @@ -19420,5 +19596,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ønter" @@ -19426,5 +19602,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 "Sedler" @@ -19432,5 +19608,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 "" @@ -19438,5 +19614,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 "" @@ -19444,5 +19620,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 "Kreditkort" @@ -19501,10 +19677,144 @@ msgstr "Bænk" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Tilbage" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Mindesmærke" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "intet" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "sted" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Farve" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Tilbage" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "ned" + +#. 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 "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "slut" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Værdi" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "vand" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Antal kabler" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Skydetelt" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Ret skydetelt" @@ -19513,30 +19823,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 "Højde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "lav" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "halv" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "fuld" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Springvand" @@ -19545,10 +19855,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Ret springvand" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Vandpost" @@ -19557,10 +19867,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Ret vandpost" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Babyluge" @@ -19568,35 +19878,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Ret babyluge" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Ret supermarked" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Feriehytte" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Ret feriehytte" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Købmand" @@ -19604,9 +19912,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Ret købmand" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19614,29 +19922,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Ret 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 "Ret busstop" - -#: 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 "Ret et træ" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Automat" @@ -19644,5 +19950,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Ret automat" @@ -19650,88 +19956,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Varer i automat" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "P-automat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "mad" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "billeder" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "dyremad" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "legetøj" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "frimærker" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "kondomer" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tamponer" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "høm-høm-pose" #. 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 "Slagter" @@ -19739,9 +20045,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Ret slagter" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Bager" @@ -19749,9 +20055,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Ret bager" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Blomsterhandler" @@ -19759,18 +20065,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Ret blomsterhandler" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Sprit" @@ -19778,54 +20084,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Redigér spritbutik" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Drikkevarer" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Redigér drikkevarebutik" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Ret computerforretning" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronik" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Ret elektronikforretning" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hi-fi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Ret hi-fi-forhandler" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Møbelforretning" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Ret møbelforretning" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Havecenter" @@ -19833,9 +20139,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Redigér havecenter" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19843,9 +20149,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Gør-det-selv-butik" @@ -19853,54 +20159,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Ret gør-det-selv-butik" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Frisør" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Ret frisør" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Ret skobutik" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Legetøjsbutik" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Redigér legetøjsbutik" -#: 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 "Redigér videobutik" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Kemisk renseri" @@ -19908,9 +20214,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Ret kemisk renseri" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Vaskeri" @@ -19918,9 +20224,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Ret vaskeri" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19928,32 +20234,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: 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 "Ret sportsbutik" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Ret optiker" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Penge" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -19961,14 +20267,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Ret bank" -#: 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 "Pengeautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Vekselkontor" @@ -19976,5 +20282,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Ret vekselkontor" @@ -19982,15 +20288,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Ret pengeautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Sundhed" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Lægehus" @@ -19998,18 +20304,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Ret lægehus" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Tandlæge" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Ret tandlæge" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apotek" @@ -20017,5 +20323,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Ret apotek" @@ -20023,9 +20329,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Håndkøb" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hospital" @@ -20033,10 +20339,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Ret Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20045,5 +20351,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20052,20 +20358,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "(brug forvalgskode, fx +12-345-67890)" @@ -20073,5 +20379,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 "Dyrlæge" @@ -20080,55 +20386,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Ret dyrlæge" #. 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 "Ret et kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Ret land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Stat" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Ret stat" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Ret region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Amt" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Ret amt" @@ -20136,15 +20442,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "By" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Ret by" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Mindre by" @@ -20152,10 +20458,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Ret mindre by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Forstad" @@ -20163,25 +20469,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Ret forstad" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "By" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Ret by" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Landsby" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Ret landsby" @@ -20189,5 +20495,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Egn" @@ -20195,10 +20501,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Ret lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ø" @@ -20206,24 +20512,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Ret ø" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "venstre" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Ret feriehytte" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Huleindgang" @@ -20231,10 +20535,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Ret huleindgang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Tinde" @@ -20242,10 +20546,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Ret tinde" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Gletsjer" @@ -20253,10 +20557,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Ret gletsjer" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkan" @@ -20264,70 +20568,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Ret vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Grænser" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Ret landegrænser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrativt" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Ret administrativ grænse" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Ret civil-grænse" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Ret politisk grænse" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Ret grænser for nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Brug af land" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Træ" @@ -20336,15 +20640,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Ret et træ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Skov" @@ -20353,5 +20657,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Ret skov" @@ -20359,17 +20663,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 "Nåleskov" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "Løvskov" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "blandet" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Skov" @@ -20378,14 +20682,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Ret skovområde" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Ret naturreservat" @@ -20393,25 +20697,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Ur" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Ret ur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Krat" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Ret krat" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Højdedrag" @@ -20419,10 +20723,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Ret højdedrag" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Hede" @@ -20430,5 +20734,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Ret hede" @@ -20436,5 +20740,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Gårdsplads" @@ -20443,45 +20747,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Ret gårdsplads" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Eng" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Ret vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Kolonihaver" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Ret kolonihave-område" @@ -20489,25 +20793,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Have" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Ret have" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Græs" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20515,10 +20819,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20526,20 +20830,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. 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 "Ret park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Rekreativt område" @@ -20547,5 +20851,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Ret rekreativt område" @@ -20553,15 +20857,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Beboelseområde" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Kirkegård" @@ -20569,9 +20873,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Ret kirkegård" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Kirkegård" @@ -20579,39 +20883,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Ret kirkegård" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Detailhandel" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Ret område for detailhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industri" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Ret industri-område" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20619,15 +20923,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militært område" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Ret militært område" @@ -20635,55 +20939,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Byggeplads" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Ret område for byggeplads" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Stenbrud" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Ret stenbrudsområde" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -20693,5 +20997,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 "Ret multipolygon" @@ -20700,10 +21004,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "ydre segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "indre segment" @@ -20711,5 +21015,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20718,5 +21022,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20724,34 +21028,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20760,15 +21064,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20776,5 +21080,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Rute" @@ -20783,5 +21087,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Ret rute" @@ -20789,5 +21093,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20795,5 +21099,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20859,5 +21163,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 @@ -20866,17 +21170,17 @@ msgstr "cykel" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "vej" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "færge" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ski" @@ -20929,5 +21233,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 @@ -20936,13 +21240,13 @@ msgstr "fod" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "vandre" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "omvej" @@ -20956,10 +21260,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "undergrundsbane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Symbol beskrivelse" @@ -20967,31 +21271,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Netvæ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 "foreslået" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Farve (hex)" @@ -21000,30 +21304,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "rute-segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24176,76 +24480,4 @@ msgstr "historisk" -#. 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 "" - #. color green #. @@ -25213,70 +25445,48 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." +#. 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 "Alle vejene var tomme" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Foren punkter med forskellige medlemsskaber?" + +#~ msgid "Merge Anyway" +#~ msgstr "Sammenflet alligevel" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. " -#~ "Rapportér venligst dette som en fejl." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Intet dokument er åbent, så der er intet at gemme." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Slet {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kan ikke åbne mappen for indstillinger: {0}" - -#~ msgid "nodes" -#~ msgstr "punkter" - -#~ msgid "ways" -#~ msgstr "veje" - -#~ msgid "relations" -#~ msgstr "relationer" - -#~ msgid "changesets" -#~ msgstr "rettesæt" - -#~ msgid "Delete Layer" -#~ msgstr "Slet lag" - -#~ msgid "Authors: {0}" -#~ msgstr "Forfattere: {0}" - -#~ msgid "Public" -#~ msgstr "Offentlig" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "DETTE ER PÅ FORSØGSBASIS. Gem dit arbejde og bekræft før afsendelse" - -#~ msgid "Continue anyway" -#~ msgstr "Fortsæt alligevel" - -#~ msgid "Edit Information Office" -#~ msgstr "Redigér informationskontor" - -#~ msgid "Map Type" -#~ msgstr "Kort type" - -#~ msgid "map" -#~ msgstr "kort" - -#~ msgid "citymap" -#~ msgstr "bykort" - -#~ msgid "hikingmap" -#~ msgstr "vandrekort" - -#~ msgid "bicyclemap" -#~ msgstr "cykelkort" +#~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk " +#~ "sammenflette dem?" + +#~ msgid "Unknown version" +#~ msgstr "Ukendt version" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Versionsnummer mangler fra OSM-data." + +#~ msgid "Found element in non-way." +#~ msgstr "Fandt -element i en ikke-vej" + +#~ msgid " has zero ref" +#~ msgstr " har nul ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Fandt -element i en ikke-relation." + +#~ msgid "Ill-formed node id" +#~ msgstr "Defekt id for punkt" #~ msgid "Move" @@ -25385,4 +25595,7 @@ #~ msgstr "Løs {0} konflikter i {1} objekter" +#~ msgid "Delete {1} {0}" +#~ msgstr "Slet {1} {0}" + #~ msgid "position" #~ msgstr "position" @@ -25406,4 +25619,7 @@ #~ msgstr "unavngivet" +#~ msgid "No document open so nothing to save." +#~ msgstr "Intet dokument er åbent, så der er intet at gemme." + #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Nogle af punkterne er (næsten) på linjen" @@ -25412,7 +25628,4 @@ #~ msgstr "Optaget af" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation" - #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?" @@ -25421,11 +25634,4 @@ #~ msgstr "Importér TCX-fil som GPS-spor" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: Musehjul eller dobbeltklik. Flyt kort: Hold højre museknap nede og " -#~ "flyt musen. Vælg: Klik" - #~ msgid "Import TCX File..." #~ msgstr "Importér TCX-fil..." @@ -25437,7 +25643,4 @@ #~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt" -#~ msgid "end" -#~ msgstr "slut" - #~ msgid "Click Reload to refresh list" #~ msgstr "Tryk Genindlæs for at genopfriske listen" @@ -25448,4 +25651,13 @@ #~ msgid "Server does not support changesets" #~ msgstr "Serveren undersøtter ikke rettesæt" + +#~ msgid "citymap" +#~ msgstr "bykort" + +#~ msgid "map" +#~ msgstr "kort" + +#~ msgid "bicyclemap" +#~ msgstr "cykelkort" #~ msgid "" @@ -25475,4 +25687,7 @@ #~ msgstr "Faldgitter" +#~ msgid "Authors: {0}" +#~ msgstr "Forfattere: {0}" + #~ msgid "Open the OpenStreetBugs window and activate the automatic download" #~ msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download" @@ -25487,4 +25702,10 @@ #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." #~ msgid "" @@ -25502,4 +25723,7 @@ #~ msgstr "Grundlæggende" +#~ msgid "Delete Layer" +#~ msgstr "Slet lag" + #~ msgid "Remove Selected" #~ msgstr "Fjern valgt" @@ -25521,4 +25745,7 @@ #~ msgstr "Relations-editor: {0}" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åbne mappen for indstillinger: {0}" + #~ msgid "Delete and Download" #~ msgstr "Slet og hent" @@ -25533,4 +25760,13 @@ #~ "Denne handling kræver {0} individuelle download-anmodninger. Vil du " #~ "fortsætte?" + +#~ msgid "Continue anyway" +#~ msgstr "Fortsæt alligevel" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "DETTE ER PÅ FORSØGSBASIS. Gem dit arbejde og bekræft før afsendelse" + +#~ msgid "Public" +#~ msgstr "Offentlig" #~ msgid "viaduct" @@ -25624,4 +25860,11 @@ #~ "datalag?" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. " +#~ "Rapportér venligst dette som en fejl." + #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -25635,4 +25878,13 @@ #~ msgid "YAHOO (WebKit)" #~ msgstr "YAHOO (WebKit)" + +#~ msgid "Edit Information Office" +#~ msgstr "Redigér informationskontor" + +#~ msgid "Map Type" +#~ msgstr "Kort type" + +#~ msgid "hikingmap" +#~ msgstr "vandrekort" #~ msgid "" @@ -25669,7 +25921,4 @@ #~ "Upload ikke noget data efter denne besked." -#~ msgid "Undeleting Way..." -#~ msgstr "Gendanner vej..." - #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Tjekker om punktet {0} er væk ..." @@ -25696,6 +25945,15 @@ #~ msgstr "Der er valgt for meget" -#~ msgid "% of lat:" -#~ msgstr "% af bredde:" +#~ msgid "nodes" +#~ msgstr "punkter" + +#~ msgid "relations" +#~ msgstr "relationer" + +#~ msgid "ways" +#~ msgstr "veje" + +#~ msgid "changesets" +#~ msgstr "rettesæt" #~ msgid "% of lon:" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 17594) +++ /applications/editors/josm/i18n/po/de.po (revision 17595) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-06 11:33+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-11 19:19+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -17,8 +17,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:04+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" @@ -26,5 +26,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 @@ -33,5 +33,5 @@ msgstr "Hilfe" -#: ../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" @@ -40,13 +40,15 @@ "benutzt." -#: ../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 @@ -62,8 +64,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 @@ -77,6 +79,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 @@ -86,5 +88,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 @@ -104,54 +106,55 @@ #: ../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 "Fehler" -#: ../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] "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" -msgstr[1] "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"{0} Ebene enthält ungespeicherte Änderungen. Diese Änderungen verwerfen und " +"fortfahren?" +msgstr[1] "" +"{0} Ebenen enthalten ungespeicherte Änderungen. Diese Änderungen verwerfen " +"und fortfahren?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Ungespeicherte Änderungen" -#: ../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 "Speichern und Beenden" -#: ../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 "Verwerfen und Beenden" -#: ../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 @@ -160,11 +163,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 @@ -178,20 +182,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 "Abbrechen" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{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 @@ -208,16 +212,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 @@ -247,17 +251,17 @@ msgstr "Warnung" -#: ../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 "Ignoriere die ungültige Datei-URL: \"{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 -#, fuzzy, java-format +#: ../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}" msgstr "" -"Die Datei ''{0}'' konnte nicht gelesen werden. Der Fehler lautet:
" -"{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -344,5 +348,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 "Plugins" @@ -357,22 +361,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-" -"Änderungsseite des Elements könnte fehlschlagen.\r\n" -"API-URL ist: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-" -"Änderungsseite des Elements könnte fehlschlagen.\r\n" -"API-URL ist: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -485,9 +483,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 @@ -521,6 +519,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 @@ -539,11 +537,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 "Information" @@ -565,5 +563,5 @@ msgstr "Bitte mindestens drei Knotenpunkte auswählen." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -574,10 +572,10 @@ "({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 "Unvereinbarkeit den Fähigkeiten der API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -588,5 +586,5 @@ "abgeschnitten" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -597,9 +595,9 @@ "die maximal erlaubte Länge ({2})." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen" -#: ../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}" @@ -656,77 +654,61 @@ msgstr "Keine Konflikte, auf die gezoomt werden kann." -#: ../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 "Weg verbinden" -#: ../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 "Mehrere Wege zu einem verbinden." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Trotzdem verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen sie " +"wirklich verbunden werden?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Richtungen ändern?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Drehen und Verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Die Wege können nicht mit ihrer aktuellen Richtungen kombiniert werden. " +"Möchten Sie, dass einige Richtungen gedreht werden?" + +#: ../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 "" +"Wege können nicht verbunden werden (Sie können nicht in eine eindeutige " +"Reihenfolge gebracht werden)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "{0} Wege verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Trotzdem verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen sie " -"wirklich verbunden werden?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Richtungen ändern?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Drehen und Verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Die Wege können nicht mit ihrer aktuellen Richtungen kombiniert werden. " -"Möchten Sie, dass einige Richtungen gedreht werden?" - -#: ../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 "Werte für alle Konflikte festlegen." - -#: ../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 "Konflikte auflösen" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "{0} Wege verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Alle Wege sind leer" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Wege können nicht verbunden werden (Sie können nicht in eine eindeutige " -"Reihenfolge gebracht werden)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -782,5 +764,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 "Entfernen" @@ -790,15 +772,15 @@ msgstr "Ausgewählte Objekte löschen." -#: ../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 "Überschreiben" -#: ../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 "Datei existiert bereits. Überschreiben?" @@ -827,10 +809,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}" @@ -861,5 +843,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 @@ -902,7 +884,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Alle Bilder" +msgstr "Alle Formate" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1040,1088 +1021,25 @@ msgstr "Aktuelle Ebene mit einer anderen zusammenführen" -#: ../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 "Knotenpunkte vereinigen" -#: ../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 "Mehrere Knotenpunkte zum ältesten vereinigen." -#: ../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 "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Trotzdem vereinen" - -#: ../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 "" -"Die gewählten Punkte gehören unterschiedlichen Relationen an. Sollen Sie " -"wirklich vereint werden?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Kann Knotenpunkte nicht vereinigen: Ein Weg, der noch verwendet wird, müsste " -"gelöscht werden." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "{0} Knotenpunkte vereinigen" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Auswahl vereinigen" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Führt die ausgewählte Primitive in eine andere Schicht" - -#: ../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 "Spiegeln" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Gewählte Knotenpunkte und Wege spiegeln." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Bitte mindestens einen Weg oder Knoten wählen." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "hoch" - -#: ../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 "Objekte {0} verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "runter" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "links" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "rechts" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "{0} verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Verschiebt Objekte {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 "Kann Objekte nicht nach außerhalb der Welt verschieben." - -#: ../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 "Neu" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Eine neue Karte erstellen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Öffnen..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Datei öffnen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Datei öffnen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Unbekannte Role \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Adresse öffnen..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Eine URL öffnen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separate Ebene" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "URL zum Herunterladen eingeben" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Adresse herunterladen" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL herunterladen" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Form rechtwinklig machen" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Nur zwei Knoten erlaubt" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Auswahl darf nur aus Wegen bestehen." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." - -#: ../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 "" -"Sie nutzen die EPSG:4326-Projektion. Diese kann beim Erzeugen
von " -"rechten Winkeln zu unerwarteten Resultaten führen.
Ändern Sie Ihre " -"Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Nur ein Knoten ausgewählt" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Rechtwinklig machen" - -#: ../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 "Einfügen" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Inhalt der Zwischenablage einfügen." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Merkmale einfügen" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "{0} herunterladen" -msgstr[1] "{0} herunterladen" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "{0} Objekte wiederherstellen" -msgstr[1] "{0} Objekte wiederherstellen" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Einstellungen..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Seite für allgemeine Einstellungen öffnen." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Einstellungen" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Wiederherstellen" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Letzte Änderung wiederherstellen." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Ebene umbennen" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Die Datei auch umbenennen" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Richtung der Wege drehen" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Die Richtung aller gewählter Wege umdrehen." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Bitte mindestens einen Weg wählen." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Richtung des Weges drehen" - -#: ../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 "Speichern" - -#: ../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 "Aktuelle Daten speichern." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Datei {0} existiert bereits. Überschreiben?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "Keine Exportfunktion gefunden! Es wurde nichts gespeichert." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Leeres Dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Das Dokument enthält keine Daten." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Trotzdem speichern" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikte" - -#: ../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 "" -"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. " -"Sollen alle Konflikte abgewiesen werden?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Konflikte abweisen und speichern" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "OSM-Datei speichern" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "GPX-Datei speichern" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Ebene speichern" - -#: ../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 "Speichern unter..." - -#: ../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 "Aktuelle Daten in einer neuen Datei speichern." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Alles auswählen" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Alle nicht gelöschten Objekte der Daten-Ebene auswählen. Damit werden auch " -"unvöllständige Objekte ausgewählt." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Statusübersicht anzeigen" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Hilfe: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Statusbericht" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "In die Zwischenablage kopieren und schließen" - -#: ../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 "Schließen" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Weg aufspalten" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Weg am gewählten Knotenpunkt aufspalten." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden." - -#: ../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] "Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." -msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." - -#: ../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] "" -"Der gewählte Knotenpunkt wird von mehreren Wegen verwendet. Bitte auch den " -"Weg auswählen." -msgstr[1] "" -"Mindestens ein gewählter Knotenpunkt wird von mehreren Wegen verwendet. " -"Bitte auch den Weg auswählen." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Die gewählten Punkte gehören nicht zum selben Weg." - -#: ../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] "Der gewählte Weg enthält nicht den gewählten Punkt." -msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte." - -#: ../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 "" -"Sie müssen zwei oder mehr Knoten auswählen, um einen kreisförmigen Weg " -"trennen zu können." - -#: ../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 "" -"Der Weg kann nicht an dieser Stelle geteilt werden. (Tipp: Wählen Sie Punkte " -"in der Mitte des Weges.)" - -#: ../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 "" -"Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege " -"kopiert.
Sie sollten dies überprüfen und falls nötig korrigieren." - -#: ../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 "" -"Alle neuen Wege wurden Element in einer Relation gemacht.
Sie " -"sollten dies überprüfen und falls nötig korrigieren." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 -#, java-format -msgid "Split way {0} into {1} parts" -msgstr "Weg {0} in {1} Teile teilen" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Schließe Änderungssatz..." - -#: ../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 "Schließe Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "Es existieren momentan keine justierbaren WMS-Ebenen" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Schließe Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "GPX-Spuren umschalten" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Globale Einstellung \"{0}\" umschalten." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Wege trennen" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Dieser Knoten ist mit nichts verbunden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Bitte wählen:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Ein Knoten mit Merkmalen, oder" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder" - -#: ../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 "" -"* Ein Knoten, der von mehr als einem Weg genutzt wird und einen dieser Wege, " -"oder" - -#: ../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 "" -"* Einen Weg, der einen oder mehr Knoten hat, die von mehr als einem Weg " -"verwendet werden, oder" - -#: ../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 "" -"* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg verwendet " -"werden." - -#: ../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 "" -"Notiz: Wenn ein Weg gewählt wird, erhält dieser Weg Kopien der\n" -"getrennten Knoten und die neuen Knoten werden ausgewählt.\n" -"Ansonsten erhält jeder Weg eine eigene Kopie \n" -"und alle Knoten werden ausgewählt." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Knotenpunkte getrennt" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "In {0} Knoten teilen" - -#. 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 "{0} Knoten in {1} Knoten teilen" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Rückgängig" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Letzte Aktion zurücknehmen." - -#: ../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 "Nichts auswählen" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Keine Objekte auswählen." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Nichts auswählen (Fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Nichts auswählen (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Daten aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" - -#. 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 "Daten aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "Aktueller Datensatz wurde nicht gefunden" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Auswahl aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Aktualisiert die ausgewählten Objekt vom Server" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Auswahl leer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Zum OSM-Server hochladen..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Alle Änderungen zum OSM-Server hochladen." - -#: ../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 "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nichts geändert. Erfassen Sie erst einige Daten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Keine Änderungen zum Hochladen vorhanden." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Nur {0} {1} synchronisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Ganzen Datensatz synchronisieren" - -#: ../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 "" -"Hochladen fehlgeschlagen, da der Server eine neuere " -"Version
von einem Ihrer Knoten, Wege oder Relationen hat.
Der Konflikt " -"wird durch ein Objekt vom Typ {0} mit ID {1} ausgelöst.
\r\n" -"Der Server hat Version {2}, Ihre Version ist {3}.
Wählen Sie {4}, um dieses Objekt zu synchronisieren.
Wählen Sie {5}, um den kompletten lokalen Datensatz mit dem Server zu " -"synchronisieren.
Wählen Sie {6}, um abzubrechen und " -"weiterzuarbeiten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Konflikt festgestellt" - -#. 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 "Unerwarteter Rückgabewert: {0}" - -#: ../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 "" -"Hochladen fehlgeschlagen, da der Server eine neuere " -"Version
von einem Ihrer Knoten, Wege oder Relationen hat.

Wählen " -"Sie {0}, um den kompletten lokalen Datensatz mit dem Server " -"zu synchronisieren.
Wählen Sie {1}, um abzubrechen und " -"weiterzuarbeiten." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Hochladen fehlgeschlagen.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Hochladen zu OSM-API fehlgeschlagen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Objekt aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Diese Änderungen hochladen?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Änderungen hochladen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Ändere neue Relation in Ebene \"{0}\"" - -#: ../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 "Einen Knotenpunkt in einen bestehenden Weg einfügen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "Alle Änderungen mit einer Anfrage hochladen" - -#: ../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 "" -"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. " -"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Karten-Einstellungen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "Änderungssatz" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Neue Objekte:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Geänderte Objekte:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Zu löschende Objekte:" - -#: ../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] "Neue Objekte:" -msgstr[1] "Neue Objekte:" - -#: ../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] "Geänderte Objekte:" -msgstr[1] "Geänderte Objekte:" - -#: ../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] "Zu löschende Objekte:" -msgstr[1] "Zu löschende Objekte:" - -#: ../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 "Letzte Änderung am {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Hineinzoomen" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Herauszoomen" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Zurück" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Springe zurück." - -#: ../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 "Schneller" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Schneller abspielen" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Vorwärts" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Springe vor." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Nächste Marke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Die nächste Marke abspielen." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Abspielen / Pause" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Ton abspielen/anhalten" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Vorherige Marke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Die vorherige Marke abspielen." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Langsamer" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Langsamer abspielen" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Hole GPS-Daten" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Heruntergeladene GPS-Daten" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "GPS-Rohdaten" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Daten herunterladen" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" -"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " -"Fehlermeldung war: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "Keine Daten importiert." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap-Daten" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "{0} von {1} herunterladen (noch {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" -"Die folgenden Fehler sind während des kombinierten Herunterladens " -"aufgetreten:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Fehler beim Herunterladen" - -#: ../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 "" -"Im lokalen Datensatz befinden sich {0} Elemente welche auf dem Server " -"möglicherweise gelöscht wurden.
Beim späteren Versuch diese hochzuladen " -"wird der Server sehr wahrscheinlich einen Konflikt melden.

Auf " -"{1} klicken um den Status der Elemente auf dem Server zu " -"überprüfen.
Auf {2} klicken um das Problem zu " -"ignorieren
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Gelöschte oder verschobene Objekte" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Löschmodus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Knotenpunkte oder Wege löschen." - -#: ../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 "Modus: {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 "" -"Anklicken: löschen. Umschalt: Lösche Wegabschnitt. Alt: unbenutze " -"Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte." - +#: ../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 @@ -2132,7 +1050,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 @@ -2141,6 +1060,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 @@ -2171,4 +1090,930 @@ msgstr "Parameter \"{0}\" darf nicht NULL sein" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Kann Knotenpunkte nicht vereinigen: Ein Weg, der noch verwendet wird, müsste " +"gelöscht werden." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "{0} Knotenpunkte vereinigen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Auswahl vereinigen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Führt die ausgewählte Primitive in eine andere Schicht" + +#: ../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 "Spiegeln" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Gewählte Knotenpunkte und Wege spiegeln." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Bitte mindestens einen Weg oder Knoten wählen." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "hoch" + +#: ../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 "Objekte {0} verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "runter" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "links" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "rechts" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "{0} verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Verschiebt Objekte {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 "Kann Objekte nicht nach außerhalb der Welt verschieben." + +#: ../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 "Neu" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Eine neue Karte erstellen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Öffnen..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Datei öffnen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Dateien öffnen" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Datei \"{0}\" öffnen..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Adresse öffnen..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Eine URL öffnen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separate Ebene" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "URL zum Herunterladen eingeben" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Adresse herunterladen" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL herunterladen" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Form rechtwinklig machen" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Nur zwei Knoten erlaubt" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Auswahl darf nur aus Wegen bestehen." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." + +#: ../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 "" +"Sie nutzen die EPSG:4326-Projektion. Diese kann beim Erzeugen
von " +"rechten Winkeln zu unerwarteten Resultaten führen.
Ändern Sie Ihre " +"Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Nur ein Knoten ausgewählt" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Rechtwinklig machen" + +#: ../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 "Einfügen" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Inhalt der Zwischenablage einfügen." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Merkmale einfügen" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "{0} Merkmal einfügen" +msgstr[1] "{0} Merkmale einfügen" + +#: ../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 "Einstellungen..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Seite für allgemeine Einstellungen öffnen." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Einstellungen" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Wiederherstellen" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Letzte Änderung wiederherstellen." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Ebene umbennen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Die Datei auch umbenennen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Richtung der Wege drehen" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Die Richtung aller gewählter Wege umdrehen." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Bitte mindestens einen Weg wählen." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Richtung des Weges drehen" + +#: ../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 "Speichern" + +#: ../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 "Aktuelle Daten speichern." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Datei {0} existiert bereits. Überschreiben?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Keine Exportfunktion gefunden! Es wurde nichts gespeichert." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Leeres Dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Trotzdem speichern" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Das Dokument enthält keine Daten." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikte" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Konflikte abweisen und speichern" + +#: ../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 "" +"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. " +"Sollen alle Konflikte abgewiesen werden?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "OSM-Datei speichern" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "GPX-Datei speichern" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Ebene speichern" + +#: ../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 "Speichern unter..." + +#: ../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 "Aktuelle Daten in einer neuen Datei speichern." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Alles auswählen" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Alle nicht gelöschten Objekte der Daten-Ebene auswählen. Damit werden auch " +"unvöllständige Objekte ausgewählt." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Statusübersicht anzeigen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hilfe: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Statusbericht" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "In die Zwischenablage kopieren und schließen" + +#: ../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 "Schließen" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Weg aufspalten" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Weg am gewählten Knotenpunkt aufspalten." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden." + +#: ../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] "Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." +msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." + +#: ../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] "" +"Der gewählte Knotenpunkt wird von mehreren Wegen verwendet. Bitte auch den " +"Weg auswählen." +msgstr[1] "" +"Mindestens ein gewählter Knotenpunkt wird von mehreren Wegen verwendet. " +"Bitte auch den Weg auswählen." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Die gewählten Punkte gehören nicht zum selben Weg." + +#: ../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] "Der gewählte Weg enthält nicht den gewählten Punkt." +msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte." + +#: ../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 "" +"Sie müssen zwei oder mehr Knoten auswählen, um einen kreisförmigen Weg " +"trennen zu können." + +#: ../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 "" +"Der Weg kann nicht an dieser Stelle geteilt werden. (Tipp: Wählen Sie Punkte " +"in der Mitte des Weges.)" + +#: ../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 "" +"Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege " +"kopiert.
Sie sollten dies überprüfen und falls nötig korrigieren." + +#: ../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 "" +"Alle neuen Wege wurden Element in einer Relation gemacht.
Sie " +"sollten dies überprüfen und falls nötig korrigieren." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Weg {0} in {1} Teile teilen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Aktuellen Änderungssatz schließen" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Den aktuelle Änderungssatz schließen..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Es gibt momentan kein offenes Changeset." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "Kein offener Änderungssatz" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Änderungssatz schließen" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "GPX-Spuren umschalten" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Globale Einstellung \"{0}\" umschalten." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Wege trennen" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Dieser Knoten ist mit nichts verbunden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Bitte wählen:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Ein Knoten mit Merkmalen, oder" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder" + +#: ../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 "" +"* Ein Knoten, der von mehr als einem Weg genutzt wird und einen dieser Wege, " +"oder" + +#: ../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 "" +"* Einen Weg, der einen oder mehr Knoten hat, die von mehr als einem Weg " +"verwendet werden, oder" + +#: ../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 "" +"* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg verwendet " +"werden." + +#: ../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 "" +"Notiz: Wenn ein Weg gewählt wird, erhält dieser Weg Kopien der\n" +"getrennten Knoten und die neuen Knoten werden ausgewählt.\n" +"Ansonsten erhält jeder Weg eine eigene Kopie \n" +"und alle Knoten werden ausgewählt." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Knotenpunkte getrennt" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "In {0} Knoten teilen" + +#. 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 "{0} Knoten in {1} Knoten teilen" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Rückgängig" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Letzte Aktion zurücknehmen." + +#: ../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 "Nichts auswählen" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Keine Objekte auswählen." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Nichts auswählen (Fokus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Nichts auswählen (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Daten aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" + +#. 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 "Daten aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Aktueller Datensatz wurde nicht gefunden" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Auswahl aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Aktualisiert die ausgewählten Objekt vom Server" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Auswahl leer" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Zum OSM-Server hochladen..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Alle Änderungen zum OSM-Server hochladen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Es gibt unbehandelte Konflilte in Ebene \"{0}\".
Sie müssen diese " +"zuerst auflösen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Nichts geändert. Erfassen Sie erst einige Daten." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Keine Änderungen zum Hochladen vorhanden." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Nur {0} {1} synchronisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Ganzen Datensatz synchronisieren" + +#: ../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 "" +"Hochladen fehlgeschlagen, da der Server eine neuere " +"Version
von einem Ihrer Knoten, Wege oder Relationen hat.
Der Konflikt " +"wird durch ein Objekt vom Typ {0} mit ID {1} ausgelöst.
\r\n" +"Der Server hat Version {2}, Ihre Version ist {3}.
Wählen Sie {4}, um dieses Objekt zu synchronisieren.
Wählen Sie {5}, um den kompletten lokalen Datensatz mit dem Server zu " +"synchronisieren.
Wählen Sie {6}, um abzubrechen und " +"weiterzuarbeiten." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Konflikt festgestellt" + +#. 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 "Unerwarteter Rückgabewert: {0}" + +#: ../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 "" +"Hochladen fehlgeschlagen, da der Server eine neuere " +"Version
von einem Ihrer Knoten, Wege oder Relationen hat.

Wählen " +"Sie {0}, um den kompletten lokalen Datensatz mit dem Server " +"zu synchronisieren.
Wählen Sie {1}, um abzubrechen und " +"weiterzuarbeiten." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" +"Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Hochladen fehlgeschlagen.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Hochladen zu OSM-API fehlgeschlagen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Objekt aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Daten für Ebene \"{0}\" hochladen" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Hineinzoomen" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Herauszoomen" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Zurück" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Springe zurück." + +#: ../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 "Schneller" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Schneller abspielen" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Vorwärts" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Springe vor." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Nächste Marke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Die nächste Marke abspielen." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Abspielen / Pause" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Ton abspielen/anhalten" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Vorherige Marke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Die vorherige Marke abspielen." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Langsamer" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Langsamer abspielen" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Hole GPS-Daten" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Heruntergeladene GPS-Daten" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "GPS-Rohdaten" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Daten herunterladen" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " +"Fehlermeldung war: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Keine Daten importiert." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap-Daten" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "{0} von {1} herunterladen (noch {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" +"Die folgenden Fehler sind während des kombinierten Herunterladens " +"aufgetreten:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Fehler beim Herunterladen" + +#: ../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 "" +"Im lokalen Datensatz befinden sich {0} Elemente welche auf dem Server " +"möglicherweise gelöscht wurden.
Beim späteren Versuch diese hochzuladen " +"wird der Server sehr wahrscheinlich einen Konflikt melden.

Auf " +"{1} klicken um den Status der Elemente auf dem Server zu " +"überprüfen.
Auf {2} klicken um das Problem zu " +"ignorieren
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Gelöschte oder verschobene Objekte" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Löschmodus" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Knotenpunkte oder Wege löschen." + +#: ../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 "Modus: {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 "" +"Anklicken: löschen. Umschalt: Lösche Wegabschnitt. Alt: unbenutze " +"Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2284,18 +2129,18 @@ "Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt." -#: ../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 "Auswahl" -#: ../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 "Objekte auswählen, verschieben, und drehen" -#: ../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" @@ -2304,18 +2149,18 @@ msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Elemente verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Verschieben rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2323,9 +2168,6 @@ "Really move them?" msgstr "" -"Sie haben mehr als {0} Elemente verschoben. Das Verschieben mehrerer " -"Elemente geschieht häufig unbeabsichtigt.\n" -"Wollen Sie sie wirklich verschieben?" - -#: ../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 "" @@ -2452,7 +2294,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - Objekt mit gegebener ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2509,41 +2350,41 @@ msgstr "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Suche starten" -#: ../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 "Nichts gefunden für Suche ''{0}''" -#: ../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 "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../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 "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../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 "{0} Treffer gefunden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2556,15 +2397,15 @@ "{2}" -#: ../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 "" "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" -#: ../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 "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" -#: ../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" @@ -2573,26 +2414,26 @@ "\"relation\"." -#: ../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 "Unerwartete Daten: {0}" -#: ../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 "Fehlendes Argument für 'OR'." -#: ../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 "Fehlendes Argument für 'NICHT'." -#: ../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 "Schließende Klammer erwartet." -#: ../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 "Falsche Anzahl an Parametern für Knoten-Operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2603,5 +2444,5 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../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." @@ -2638,62 +2479,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Knotenpunkt hinzufügen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "{0} {1} hinzufügen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relationen: {0}" +msgstr "Relation {0} hinzufügen" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Änderungssatz {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Änderungssatz {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Relation ändern" +msgstr "Relation {0} verändern" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "\"{0}\" entfernen für {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "\"{0}\" entfernen für {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "\"{0}\" entfernen für {1} \"{2}\"" +msgstr "\"{0}\" aus Relation \"{1}\" entfernen" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "{0}={1} setzen für {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "{0}={1} setzen für {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "{0}={1} setzen für {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2769,30 +2610,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] "{0} {1} löschen" -msgstr[1] "{0} {1} löschen" +msgstr[0] "{0} Objekt löschen" +msgstr[1] "{0} Objekte löschen" #: ../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] "Löschmodus" -msgstr[1] "Löschmodus" +msgstr[0] "{0} Knoten löschen" +msgstr[1] "{0} Knoten löschen" #: ../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] "{0} {1} löschen" -msgstr[1] "{0} {1} löschen" +msgstr[0] "{0} Weg löschen" +msgstr[1] "{0} Wege löschen" #: ../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] "Aus der Relation entfernen" -msgstr[1] "Aus der Relation entfernen" +msgstr[0] "{0} Relation löschen" +msgstr[1] "{0} Relationen löschen" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2806,20 +2647,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n" -"Aus Relation entfernen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n" -"Aus Relation entfernen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2830,5 +2667,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." @@ -2911,17 +2748,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2931,17 +2768,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Versionskonflikt für {0} {1} auflösen" +msgstr "Versionskonflikte für Knoten {0} auflösen" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Versionskonflikt für {0} {1} auflösen" +msgstr "Versionskonflikte für Weg {0} auflösen" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Versionskonflikt für {0} {1} auflösen" +msgstr "Versionskonflikte für Relation {0} auflösen" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3031,11 +2868,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." msgstr "" -"Fehler beim Setzen der Referenz. Referenz-ID {0} stimmt nicht mit der ID " -"'{1}' der Geschichte überein" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3065,4 +2900,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"Warnung: Fehlende Einstellungsdatei \"{0}\". Erstelle Datei mit " +"Standardeinstellungen." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -3081,9 +2918,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3152,5 +2989,5 @@ msgstr "O" -#: ../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 @@ -3158,22 +2995,47 @@ msgstr "Änderungssatz {0}" -#: ../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 "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"." -#: ../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 "Parameter \"{0}\" darf nicht NULL sein" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Fehler: {0}" -#: ../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 "Warnung: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "Unerwarteter Spaltenindex ({0})" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "id > 0 erwartet, aber {0} erhalten" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "id > 0 erwartet, aber {0} erhalten" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3190,11 +3052,16 @@ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse." -#: ../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 "" @@ -3248,9 +3115,9 @@ msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" -#: ../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 "Flächenförmiger Weg ist nicht geschlossen." -#: ../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." @@ -3259,118 +3126,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 "Leeres Element in der Relation." -#: ../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 "Gelöschtes Element ''{0}'' in der Relation." -#: ../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 "Weg ''{0}'' mit weniger als zwei Knoten." -#: ../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 "Mehr als ein Weg mit \"from\" gefunden." -#: ../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 "Mehr als ein Weg mit \"to\" gefunden." -#: ../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 "Mehr als ein Element mit \"via\" gefunden." -#: ../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 "Unbekannte Role \"{0}\"." -#: ../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 "Unbekannter Elementtyp für \"{0}\"." -#: ../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 "Kein \"from\"-Weg gefunden." -#: ../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 "Kein \"to\"-Weg gefunden." -#: ../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 "Kein \"via\"-Knoten oder Weg gefunden." -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../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 "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../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 "Kein Zeichenstil für Abbiegeregel {0} gefunden." -#: ../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 "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." -#: ../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 "Nicht-Weg ''{0}'' im Multipolygon." -#: ../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 "Kein äußerer Weg im Multipolygon ''{0}''." -#: ../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 "Die Wege ''{0}'' und {1}'' kreuzen sich." -#: ../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 "Innerer Weg \"{0}\" ist außerhalb." -#: ../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 "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." -#: ../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 "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." -#: ../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 "Ohne Merkmale" -#: ../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 "Text" @@ -3395,5 +3262,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" @@ -3404,5 +3271,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" @@ -3413,5 +3280,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" @@ -3494,7 +3361,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Die Lesezeichen konnten nicht gelesen werden.
{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3525,5 +3392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "Eisenbahn" @@ -3555,146 +3422,34 @@ msgstr[1] "{0} Elemente" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n" -"Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung." - -#. 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 "unbekannt" - -#: ../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 "" -"Hochladen auf den Server ist fehlgeschlagen, da der " -"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung ist:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Vorbedingung nicht erfüllt" -#: ../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 "" -"Der Sicherheitskontext erlaubt keine Verbindung zum Server
''{0}''." -"
Wahrscheinlich haben Sie JOSM als applet gestartet, und dieses " -"Applet
nicht von ''{1}'' geladen." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Sicherheitsausnahme" -#: ../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 "" -"Öffnen einer Verbindung zum entfernten Server
''{0}'' " -"fehlgeschlagen.
Bitte prüfen Sie die Internetverbindung." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Netzwerkausnahme" -#: ../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 "" -"Datenübertragungsfehler zum Server
\"{0}\"
beim Hoch- oder " -"Herunterladen.
Details: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" msgstr "Ein-/Ausgabefehler" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 "" -"Öffnen einer Verbindung zum entfernten Server
''{0}'' " -"fehlgeschlagen.
Hostname \"{1}\" konnte nicht aufgelöst werden.
Bitte " -"prüfen Sie die API-URL in den Einstellungen und die Internetverbindung." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 +msgstr "Interner Server-Fehler" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Schlagball (Racquet)-Platz bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Rechner unbekannt" -#: ../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 "" -"Hochladen fehlgeschlagen, da das zu löschende " -"Objekt
auf dem Server schon gelöscht ist.

Die Fehlermeldung ist:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Objekt bereits gelöscht" @@ -3844,5 +3599,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/PFAD/ZU/JOSM/ORDNER/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3916,5 +3671,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}" @@ -4312,4 +4067,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 @@ -4383,8 +4140,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 @@ -4520,5 +4277,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 "gelöscht" @@ -4578,10 +4335,10 @@ #: ../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 "Nein, abbrechen" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4589,7 +4346,4 @@ "yo agree?" msgstr "" -"Um die lokale Version zu erhalten muss JOSM die ID von {0} {1} auf " -"Null zurücksetzen.
Beim nächsten mal Hochladen wird der Server dann eine " -"neue ID zuteilen.
Sind Sie hiermit einverstanden?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4623,4 +4377,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 @@ -4634,5 +4389,5 @@ msgstr "Objekt" -#: ../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 "" @@ -4740,4 +4495,40 @@ msgstr "Server-Daten beinhalten keine Merkmale mit dem Schlüssel {0}." +#: ../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 "Keine verbleibenden Merkmalskonflikte zu beheben" + +#: ../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 "Übernehmen" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4750,26 +4541,23 @@ msgstr "alle" -#: ../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 "Farbe auswählen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgstr "Wert wählen" + +#: ../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 -#, fuzzy, java-format +#: ../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 "" -"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-" -"Name." - -#: ../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}''" @@ -4777,13 +4565,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "Parameter \"{0}\" darf nicht NULL sein" +msgstr "Parameter \"{0}\" darf nicht leer sein" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" msgstr "" -"Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4791,12 +4578,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "nicht gelöscht" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 +#: ../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 "" @@ -4807,17 +4595,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "Von Weg" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Aus der Relation entfernen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikte in den Daten" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4841,41 +4626,91 @@ msgstr[1] "{0} Relationen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Konfliktlösung" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Konflikte auflösen" - -#: ../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 "Übernehmen" - #: ../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 "Einfügen" +msgstr "Einfügen..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "From ..." -msgstr "" +msgstr "Von..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "To ..." -msgstr "" +msgstr "Nach..." #: ../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} Anfang" -msgstr[1] "{0} Anfang" +msgstr[0] "{0} Tag" +msgstr[1] "{0} Tags" + +#: ../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 "Das aktuell ausgewählte Element aus dieser Beziehung entfernen" + +#: ../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 "Ort" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Unentschieden" + +#. --- 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 "Rolle:" + +#: ../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 "Taste:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Wert" + +#: ../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 "Einbahnstraße" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Version" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4902,5 +4737,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}" @@ -4931,5 +4766,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." @@ -5010,13 +4845,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 "Ebene: {0}" +msgstr "Weg {0}" #: ../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 "Relationen: {0}" +msgstr "Relation {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5104,5 +4939,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 "" @@ -5161,5 +4996,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 "Hinzufügen" @@ -5209,5 +5044,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 "Relationen" @@ -5306,32 +5141,27 @@ #: ../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] "{0} Autor" +msgstr[1] "{0} Autoren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -#, fuzzy msgid "Select primitives submitted by this user" -msgstr "Objekte für gewählte Relationselemente auswählen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Anzeigen" +msgstr "Informationen anzeigen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Mehr Informationen zu dieser Vorlage" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"Achtung: Nur die ersten {0} von {1} markierten Elementen werden im Browser " -"angezeigt." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5408,5 +5238,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}" @@ -5426,9 +5256,4 @@ msgid "Child Relations" msgstr "Child-Verknüpfungen" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Rolle:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5711,11 +5536,11 @@ msgstr "Verknüpft" -#: ../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 "Verweisende Relationen herunterladen" -#: ../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 +#, fuzzy, java-format +msgid "child.getId() >0 expected. Got {1}" msgstr "Erwarte child.id > 0. Erhielt {1}" @@ -5729,7 +5554,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Lade Elternrelationen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5856,5 +5680,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Orte" @@ -5932,8 +5756,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "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 "" "Zoom: Mausrad, Doppelklick oder Strg + Hoch/Runter Karte bewegen: 0 expected, got {0}" -msgstr "Erwarte child.id > 0. Erhielt {1}" +msgstr "id > 0 erwartet, aber {0} erhalten" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Lade Historie für {0} mit ID {1}" +msgstr "Chronik für Knoten {0} laden" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Lade Historie für {0} mit ID {1}" +msgstr "Chronik für Weg {0} laden" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Lade Historie für {0} mit ID {1}" +msgstr "Chronik für Relation {0} laden" #. item "Streets/Motorway" text "Reference" @@ -6877,52 +6701,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 "Name" @@ -6932,23 +6756,21 @@ msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Version {0} erzeugt am {1} von " -"{2}" +"{2} in changeset {3}" +msgstr "" +"Version {0} erstellt am {1} von " +"{2} im Changeset {3}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Änderungssatz {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Mehr Informationen zu dieser Vorlage" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Änderungssatz {0}" +msgstr "Changeset {0} anzeigen" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6966,7 +6788,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Straßenname" +msgstr "Dateinamen wählen" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -7007,12 +6828,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Bitte wählen Sie einen Wert" +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 "Ebene ''{0}'' muss in der Liste der Ebenen sein" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -7057,6 +6877,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Merkmalskonflikte beheben" +msgid "Unsaved data and conflicts" +msgstr "Konflikte auflösen" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -7073,5 +6893,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 "" @@ -7091,5 +6911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 #, fuzzy -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "Standarddatei zum Merkmale ignorieren verwenden." @@ -7101,22 +6921,24 @@ msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" +"JOSM ohne Speichern verlassen. Ungespeicherte Änderungen gehen verloren." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Verwerfen und Beenden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" +"Ebene ohne Speichern löschen. Ungespeicherte Änderungen gehen verloren." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" +"JOSM mit Speichern verlassen. Ungespeicherte Änderungen werden hochgeladen " +"und/oder gespeichert." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Speichern und Beenden" +msgstr "Speichern und Löschen" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7127,5 +6949,5 @@ #, java-format msgid "Preparing layer ''{0}'' for upload ..." -msgstr "" +msgstr "Ebene \"{0}\" für Hochladen vorbereiten..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 @@ -7134,8 +6956,10 @@ "cancelled or has been failed." msgstr "" +"Ein Hochlade- und/oder Speichervorgang einer Ebene mit " +"Modifikationen
wurde abgebrochen oder ist fehlgeschlagen." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 msgid "Incomplete upload and/or save" -msgstr "" +msgstr "Unvollständiges Hochladen und/oder Speichern" #. item "Streets/Motorway" text "Name" @@ -7194,7 +7018,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Beim Hochladen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7203,17 +7026,156 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 -#, fuzzy msgid "Filename" -msgstr "Datei" +msgstr "Dateiname" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 -#, fuzzy msgid "Upload" msgstr "Hochladen" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124 +msgid "Use a new changeset and close it" +msgstr "Neuen Änderungssatz erstellen und danach schließen" + +#: ../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 "" +"Auswählen, um in ein neues Changeset hochzuladen und das Changeset dann zu " +"schließen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "Neuen Änderungssatz erstellen und geöffnet lassen" + +#: ../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 "" +"Auswählen, um in ein neues Changeset hochzuladen und das Changeset für " +"weitere Uploads geöffnet zu lassen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 +msgid "Upload to a new or to an existing changeset?" +msgstr "In einem neuen oder vorhandenen Änderungssatz hochladen?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "Alle Änderungen mit einer Anfrage hochladen" + +#: ../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 "" +"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. " +"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Einstellungen" + +#: ../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 "Merkmale des neuen Änderungssatzes" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Neue Objekte:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Geänderte Objekte:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Zu löschende Objekte:" + +#: ../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] "{0} hinzugefügtes Objekt:" +msgstr[1] "{0} hinzugefügte Objekte:" + +#: ../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] "{0} bearbeitetes Objekt:" +msgstr[1] "{0} bearbeitete Objekte:" + +#: ../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] "{0} zu löschendes Objekt:" +msgstr[1] "{0} zu löschende Objekte:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Vorhandenes Changeset {0} verwenden und nach dem Upload schließen" + +#: ../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 "" +"Auswählen, um in das vorhandene Changeset {0} hochzuladen und das Changeset " +"dann zu schließen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "Vorhandenes Changeset {0} verwenden und geöffnet lassen" + +#: ../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 "" +"Auswählen, um in das vorhandene Changeset {0} hochzuladen und das Changeset " +"für weitere Uploads geöffnet zu lassen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Merkmale für Änderungssatz {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Änderungen hochladen" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 +#, fuzzy +msgid "Upload the changed primitives" +msgstr "Diese Änderungen hochladen?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 +#, fuzzy +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Bitte geben Sie einen Namen für den Ort an." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Updates abbrechen und den Dialog schliessen" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7446,5 +7408,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." @@ -7502,5 +7463,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" msgstr "Daten herunterladen" @@ -7570,4 +7530,13 @@ msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" + +#: ../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 "" +"Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!" +"
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7765,5 +7734,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 "Bitte wählen Sie die zu löschende Zeile." @@ -8250,7 +8219,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Objektnummer in Auswahllisten anzeigen" +msgstr "Übersetzten Namen in Auswahllisten anzeigen" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8265,7 +8233,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Objektnummer in Auswahllisten anzeigen" +msgstr "Übersetzten Namen in Auswahllisten anzeigen, sofern verfügbar" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8639,8 +8606,4 @@ msgstr "Ausschalten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Taste:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8697,5 +8660,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 @@ -8706,42 +8669,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Neue Ebene hinzufügen" +msgstr "Neues Tag hinzufügen" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Ausgewählte Ebene löschen." - -#: ../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 "Mehr Informationen zu dieser Vorlage" #. 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 "Optionale Attribute:" -#: ../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 "Verwende Vorlage \"{0}\" aus Gruppe \"{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 "Verwende Vorlage \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "geschlossener Weg" -#: ../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 "Unbekannter Typ: {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 @@ -8752,15 +8713,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {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 "Fehler beim Einlesen von {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 des Typs {0} werden unterstützt." -#: ../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 @@ -8770,18 +8731,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../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 "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -8808,5 +8769,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, vielleicht fehlende Merkmale." @@ -8822,7 +8782,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 @@ -8900,5 +8857,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}" @@ -8906,5 +8863,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" @@ -8912,5 +8869,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" @@ -8933,6 +8889,6 @@ "daher unklar." -#: ../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 @@ -8942,40 +8898,40 @@ msgstr "OSM-Daten herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#, java-format msgid "Fetching node with id {0} from ''{1}''" -msgstr "Hole {0} mit id {1} von ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#, java-format msgid "Fetching way with id {0} from ''{1}''" -msgstr "Hole {0} mit id {1} von ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Hole {0} mit id {1} von ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#, java-format msgid "Fetching a package of nodes from ''{0}''" -msgstr "Hole ein Paket{0} von ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#, java-format msgid "Fetching a package of ways from ''{0}''" -msgstr "Hole ein Paket{0} von ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Hole ein Paket{0} von ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9039,10 +8995,10 @@ msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../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 "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -9052,46 +9008,28 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +msgstr "Changeset erstellen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293 #, java-format msgid "Successfully opened changeset {0}" -msgstr "" +msgstr "Changeset {0} erfolgreich geöffnet" #: ../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 "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +msgstr "Changeset aktualisieren..." + +#: ../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 +msgstr "Changeset {0} ist unverändert. Aktualisierung überspringen." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 +#, java-format msgid "Updating changeset {0}..." -msgstr "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgstr "Changeset {0} aktualisieren..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "" "Failed to update changeset. Either there is no current changeset or the id " @@ -9099,44 +9037,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Schließe Änderungssatz..." -#: ../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 "Schließe Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#, fuzzy, java-format +msgstr "Changeset {0} schließen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#, java-format msgid "Leaving changeset {0} open..." -msgstr "Öffne Änderungssatz..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +msgstr "Changeset {0} geöffnet lassen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372 msgid "No changeset present for diff upload" msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409 +#, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." -msgstr "Starte Wiederholung {0} von {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +msgstr "Starte Versuch {0} von {1} in {2} Sekunden..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../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}." @@ -9155,10 +9093,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 "OSM-Server-Dateien (bzip2-komprimiert)" -#: ../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 "Ungültige bz2-Datei." @@ -9221,6 +9159,11 @@ "übertragen.
Benutzen Sie kein wertvolles Passwort." +#: ../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-Server-Dateien" @@ -9253,5 +9196,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 "OSM-Server-Dateien (gzip-komprimiert)" @@ -9319,78 +9262,145 @@ msgstr "Fehler beim Parsen." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Unbekannte Version" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Fehlende Versionsnummer in OSM-Daten" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "notwendiges Attribut \"{0}\" fehlt" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "notwendiges Attribut \"{0}\" fehlt" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Unbekannte Version: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "notwendiges Attribut \"{0}\" fehlt" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Ein Element in einem Nicht-Weg gefunden." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " hat Null ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "-Schlüssel bei einer Nicht-Relation gefunden." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "" +"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "Fehlendes \"ref\"-Attribut bei Element der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" "Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Fehlendes \"type\"-Attribut bei Element {0} der Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "" -"Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " -"Relation {1}" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Unvollständige -Beschreibung mit 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Illegales Objekt mit 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Unbekannte Version: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Fehlendes \"version\"-Attribut bei OSM-Objekt mit ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl" + +#: ../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 "" @@ -9401,16 +9411,32 @@ "einer der referenzierten Knoten nicht in den geladenen Daten enthalten war." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, fuzzy, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "Unbekannter Relationselementtyp {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440 -#, java-format -msgid "Unknown relation member type {0}" -msgstr "Unbekannter Relationselementtyp {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "" +"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" " +"verglichen werden" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "OSM-Daten werden vorbereitet...." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Falsch formatierte Knoten-ID" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Lese OSM-Verlaufsdaten ein..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Daten werden vorbereitet...." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9458,36 +9484,43 @@ "Internetverbindung." -#: ../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} verbleiben. Überspiele {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 -#, fuzzy, java-format +msgstr "{0}% ({1}/{2}), {3} verbleiben. Knoten ''{4}'' (id: {5}) hochladen" + +#: ../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} verbleiben. Überspiele {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 -#, fuzzy, java-format +msgstr "{0}% ({1}/{2}), {3} verbleiben. Weg ''{4}'' (id: {5}) hochladen" + +#: ../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} verbleiben. Überspiele {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 -#, fuzzy, java-format +msgstr "{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (id: {5}) hochladen" + +#: ../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 "Daten hochladen..." + +#: ../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 "" -"WARNUNG: Einstellung ''{0}'' oder API-Version ''{1}'' des Datensatz " -"verlangen die Nutzung von Änderungssätzen, aber die API kann diese nicht " -"verarbeiten. Ignorieren der Änderungssätze." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 -#, fuzzy -msgid "Starting to upload in one request ..." -msgstr "Nichts geändert. Erfassen Sie erst einige Daten." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9525,12 +9558,7 @@ msgstr "Plugin {0} herunterladen..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Herunterladen überspringen" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "Für Plugin {1} wird JOSM-Version {0} benötigt." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9542,4 +9570,9 @@ msgstr "Herunterladen überspringen" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Für Plugin {1} wird JOSM-Version {0} benötigt." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9583,21 +9616,21 @@ #: ../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 "Plugin abschalten" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Plugin behalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -9607,5 +9640,9 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../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 "" @@ -9615,10 +9652,10 @@ "ausgelöst haben könnte." -#: ../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 "Laut den Informationen des Plugins ist der Autor des Plugins {0}." -#: ../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." @@ -9627,9 +9664,9 @@ "Plugins, bevor Sie den Fehler melden." -#: ../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 "Soll das Plugin abgeschaltet werden?" -#: ../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 " @@ -9639,5 +9676,5 @@ "um das Plugin zu entfernen." -#: ../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 "" @@ -9645,9 +9682,9 @@ "deaktiviert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Plugin-Information" -#: ../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" @@ -9704,4 +9741,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 "unbekannt" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9777,4 +9845,109 @@ msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)" +#: ../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 "" +"Hochladen auf den Server ist fehlgeschlagen, da der " +"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung ist:
" +"{0}" + +#: ../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 "" +"Der Sicherheitskontext erlaubt keine Verbindung zum Server
''{0}''." +"
Wahrscheinlich haben Sie JOSM als applet gestartet, und dieses " +"Applet
nicht von ''{1}'' geladen." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Öffnen einer Verbindung zum entfernten Server
''{0}'' " +"fehlgeschlagen.
Bitte prüfen Sie die Internetverbindung." + +#: ../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 "" +"Datenübertragungsfehler zum Server
\"{0}\"
beim Hoch- oder " +"Herunterladen.
Details: {1}" + +#: ../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 +#, fuzzy +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 "" +"Die maximale Downloadgröße ist 0.25 und Ihre Anfrage war zu groß. Fordern " +"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei planet." +"osm." + +#: ../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 "" +"Öffnen einer Verbindung zum entfernten Server
''{0}'' " +"fehlgeschlagen.
Hostname \"{1}\" konnte nicht aufgelöst werden.
Bitte " +"prüfen Sie die API-URL in den Einstellungen und die Internetverbindung." + +#: ../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 "" +"Hochladen fehlgeschlagen, da das zu löschende " +"Objekt
auf dem Server schon gelöscht ist.

Die Fehlermeldung ist:" +"
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9855,5 +10028,5 @@ "''{0}'' gelesen werden. Fehlermeldung war: {1}" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9862,5 +10035,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9869,5 +10042,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9876,5 +10049,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9883,5 +10056,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9916,13 +10089,14 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 msgid "Private (only shared as anonymous, unordered points)" -msgstr "" +msgstr "Privat (nur als anonyme, ungeordnete Punkte verfügbar)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 msgid "Public (shown in trace list and as anonymous, unordered points)" msgstr "" +"Öffentlich (in der Liste und als anonyme, ungeordnete Punkte verfügbar)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 msgid "Trackable (only shared as anonymous, ordered points with timestamps)" -msgstr "" +msgstr "Auffindbar (als anonyme, geordnete Punkte mit Zeitstempel verfügbar)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62 @@ -9931,4 +10105,6 @@ "timestamps)" msgstr "" +"Identifizierbar (in der Liste und als identifizierbare, geordnete Punkte mit " +"Zeitstempel verfügbar)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 @@ -9942,40 +10118,39 @@ msgstr "GPS-Spuren hochladen" -#: ../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 +msgstr "Sichtbarkeit" + +#: ../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 +msgstr "Legt die Sichtbarkeit Ihrer Tracks für andere OSM-Nutzer fest." + +#: ../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 "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "(What does that mean?)" -msgstr "" +msgstr "(Was bedeutet das?)" #. 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 "Beschreibung" -#: ../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 "Bitte Beschreibung für die GPS-Spur angeben." -#: ../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 +msgstr "Tags (mit Kommas getrennt)" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146 msgid "Please enter tags about your trace." msgstr "Bitte Stichworte für die GPS-Spur angeben." -#: ../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}" @@ -9983,48 +10158,48 @@ #. 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 "Verbinden..." -#: ../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 "Hochladen abgebrochen" -#: ../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 "Fehler beim Hochladen" -#: ../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 "GPX-Hochladen war erfolgreich" -#: ../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 "" "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " -#: ../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 "GPS-Spur hochladen: {0}% ({1} von {2})" -#: ../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 "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen." -#: ../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 "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen." -#: ../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 "Kein Nutzername angegeben." -#: ../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 "Kein Passwort angegeben." -#: ../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 "GPS-Spur hochladen" @@ -10244,5 +10419,5 @@ msgstr "Noch nicht referenzierte Bilder" -#: ../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 "Bilder mit GPS-Spur korrelieren" @@ -10256,13 +10431,13 @@ msgstr "Automatisch ermitteln" -#: ../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 "Wählen Sie eine GPS-Spur" -#: ../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 "Keine GPS-Spur gewählt" -#: ../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 "" @@ -10273,9 +10448,9 @@ "Erwartetes Format: {0}" -#: ../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 "Ungültige Zeitzone" -#: ../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 "" @@ -10286,26 +10461,26 @@ "Erwartetes Format: {0}" -#: ../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 "Ungültiger Offset" -#: ../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 "{0} Treffer für {1} in GPS-Spur {2} gefunden" -#: ../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 "GPS-Spur geladen" -#: ../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 "Die gewählten Bilder enthalten keine Zeitinformation." -#: ../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 "Bilder enthalten keine Zeitinformation" -#: ../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." @@ -10314,39 +10489,39 @@ "andere." -#: ../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 "GPS-Spur enthält keine Zeitinformationen" -#: ../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 "Zeitzone: {0}" -#: ../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 "Minuten: {0}" -#: ../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 "Sekunden: {0}" -#: ../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 "{0} von {1} Bildern mit GPS-Spur synchronisiert." -#: ../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 "(Zeitdifferenz von {0} Tagen)" -#: ../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 "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" -#: ../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 " @@ -10357,13 +10532,13 @@ "synchonisieren." -#: ../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 "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." -#: ../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 "Zeitzone und Offset anpassen" -#: ../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 "Standardwerte" @@ -10404,5 +10579,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 "Fehler beim Laden der Datei" @@ -10431,11 +10606,11 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Stadt {0} nicht gefunden oder im WMS nicht vorhanden.\n" -"Bitte prüfen Sie die Verfügbarkeit unter www.cadastre.gouv.fr" +"Ort/Stadt {0} nicht gefunden oder nicht verfügbar\n" +"oder Aktion abgebrochen" #. this below is a temporary workaround to fix the "always on top" issue @@ -10451,13 +10626,13 @@ msgstr "Wähle aus..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../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" @@ -10470,13 +10645,13 @@ "Wollen Sie wieder zum Bilder holen nutzen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Tastaturkürzel wiederherstellen" -#: ../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 "JOSM wird zum Aktivieren der Änderung beendet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10504,7 +10679,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 -#, fuzzy msgid "Disable image cropping during georeferencing." -msgstr "Klicke zur Georeferenzierung auf das zweite Lambert-Kreuz.\n" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 @@ -10603,9 +10777,9 @@ "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Automatisches \"source\"-Merkmal:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Merkmal \"source=...\" zu Elementen hinzufügen?" @@ -10697,5 +10871,4 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 -#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" @@ -10703,6 +10876,4 @@ "projections and retry" msgstr "" -"Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion auf " -"eine der Katasterprojektionen und starten neu." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 @@ -10741,12 +10912,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 -#, fuzzy msgid "Image georeferencing" -msgstr "Nehme ein nicht georeferenziertes Bild." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 -#, fuzzy msgid "Click second Lambert crosspiece for georeferencing" -msgstr "Klicke zur Georeferenzierung auf das zweite Lambert-Kreuz.\n" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 @@ -10773,7 +10942,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Auswahl" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10861,5 +11029,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 "Leere Ebene" @@ -11821,18 +11989,18 @@ msgstr "Unbekannter Status des Fehlers" -#: ../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 "Sichtbare öffnen..." -#: ../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 "Nur Dateien öffnen, die in der aktuellen Ansicht sichtbar sind." -#: ../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 "Keine Daten sichtbar, kann Grenzen nicht bestimmen!" -#: ../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}" @@ -11843,5 +12011,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11851,9 +12019,9 @@ "den Pfad zu Firefox ein." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "Einstellungen für Osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox-Programm" @@ -11864,28 +12032,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Einen neuen Knoten erstellen." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "Auswahl ändern" -#: ../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 "Ansicht wechseln" -#: ../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 "Alle Fernsteueraktionen manuell bestätigen" -#: ../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 "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." -#: ../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 "Fernbedienung" -#: ../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 "Einstellungen für das Fernbedienungs-Plugin." -#: ../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 " @@ -11897,28 +12070,35 @@ "Anwendungen adressiert werden muss, die das Plugin nutzen." -#: ../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 "Erlaubte Aktionen" -#: ../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 "Die Fernsteuerung soll Daten vom API herunterladen." -#: ../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 "Details der Anfrage: {0}" -#: ../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 "Soll dies erlaubt werden?" -#: ../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 "Fernsteueraktion bestätigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Die Fernsteuerung soll Daten vom API herunterladen." + +#: ../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 "Die Fernsteuerung soll Daten von folgender URL herunterladen:" @@ -12422,25 +12602,33 @@ "prüfen Sie, dass keine Fehler entstanden sind." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Werte für alle Konflikte festlegen." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Konflikte auflösen" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Merkmalskonflikte beheben" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Elemente aus Relationen entfernt" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Flächen verbinden: Kurze Wege entfernen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Weg geschlossen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Entferne Merkmale von inneren Wegen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funktion zum Flächen verbinden" @@ -12516,6 +12704,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 "Ergebnisse der Datenprüfung" @@ -12525,10 +12713,10 @@ msgstr "Keine Fehler gefunden" -#: ../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 "Raster" -#: ../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 "" @@ -12619,51 +12807,66 @@ msgstr "Datenprüfung ausführen" -#: ../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 "Die Daten enthalten Fehler. Trotzdem hochladen?" -#: ../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 "Fenster mit dem Ergebnis der Prüfung öffnen." -#: ../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 "Zoom auf Problem" -#: ../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 "Reparieren" -#: ../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 "Ausgewählte Fehler korrigieren." -#: ../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 "Ignorieren" -#: ../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 "Ausgewählte Fehler beim nächsten Mal ignorieren." -#: ../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 "Komplette Gruppe" -#: ../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 "Einzelne Elemente" -#: ../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 "Nichts" -#: ../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 "Ganze Gruppe oder einzelne Elemente ignorieren?" -#: ../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 "Elemente ignorieren" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Warte 10 Sekunden... " + +#: ../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 "Changeset aktualisieren..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12689,16 +12892,15 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Dieser Test prüft, ob zwei Straßen, Eisenbahnlinien oder Wasserwege sich in " -"der selben Ebene überschneiden, aber nicht durch einen Knoten verbunden sind." +"Dieser Test prüft, ob sich zwei Straße, Schienen- oder Wasserwege oder " +"Gebäude auf derselben Ebene schneiden ohne mit einem Knoten verbunden zu " +"sein." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Gebäude erstellen" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12706,19 +12908,18 @@ msgstr "Überschneidende Wege" -#: ../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 "Doppelte Knoten" -#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Knoten mit demselben Namen" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "Knoten auf derselben Position" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Bestätigung" @@ -12726,19 +12927,18 @@ #: ../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 "Weg duplizieren" +msgstr "Überlappende Wege" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." +msgstr "" +"Dieser Test prüft, dass keine Wege mit den gleichen Tags auf den selben " +"Koordinaten liegen." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Weg duplizieren" +msgstr "Überlappende Wege löschen" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13329,5 +13529,5 @@ msgstr "Kreuzung erreicht" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Fehler" @@ -13434,5 +13634,5 @@ msgstr "Berichtigtes Bild hinzufügen" -#: ../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 " @@ -13442,5 +13642,5 @@ "zugeordnet werden. Bitte versuchen Sie es erneut." -#: ../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 "Keine gültige WMS-URL oder ID" @@ -13458,17 +13658,17 @@ msgstr "Bitte wählen Sie die zu justierende WMS-Ebene." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "WMS-Ebene wählen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Justierung starten" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "Es existieren momentan keine justierbaren WMS-Ebenen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "Keine Ebenen zum justieren" @@ -13490,5 +13690,5 @@ #, java-format msgid "Warning: The complete URL is ''{0}''." -msgstr "" +msgstr "Achtung: Die vollständige URL lautet \"{0}\"" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 @@ -13509,21 +13709,22 @@ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" +"Achtung: WMS-Ebene wurde deaktiviert, da die Basis-URL \"{0}\" ein " +"ungültiges Format hat" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Aktivieren" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +msgstr "(deaktiviert)" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../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 "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13533,15 +13734,18 @@ "tiles anyway?" msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +"Die Basis-URL
''{0}''
für diese WMS-Ebene endet weder mit einem " +"''&'' noch mit einem ''?''.
Wahrscheinlich ist diese WMS-Anfrage " +"ungültig. Prüfen Sie Ihre Einstellungen.
Sollen die WMS-Kacheln trotzdem " +"heruntergeladen werden?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 -#, fuzzy +msgstr "Ja, Kacheln herunterladen" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Ungültiges Datum" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "Ungültige URL?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13550,102 +13754,113 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../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 "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Einstellungen für WMS-Plugin" -#: ../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 "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden" -#: ../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 "Menüname" -#: ../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 "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Menüname (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS-URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Standard kopieren" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "Ausgewählte Standardwerte kopieren" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Bitte mindestens einen Weg wählen." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Herunterladeprogramm:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +#, fuzzy +msgid "Overlap tiles" +msgstr "Überlappende Flächen" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "Nord" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TCX-Dateien (*.tcx)" +msgstr "WMS-Dateien (*.wms)" #. * @@ -14063,5 +14278,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 "Referenz" @@ -14603,7 +14818,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Ferienhaus" +msgstr "asphaltiert" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14624,8 +14838,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 "Vermietung" +msgstr "metall" #. color heath @@ -14643,5 +14856,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 "Naturwald" @@ -14654,7 +14868,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "Parkscheine" +msgstr "Platte" #. item "Ways/Track Grade 2" combo "Surface" @@ -14690,7 +14903,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "gepflastert" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14701,7 +14913,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "unvollständig" +msgstr "verdichtet" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14712,7 +14923,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "Gras" +msgstr "Rasengitterstein" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14906,4 +15116,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" @@ -14932,12 +15143,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 "ja" #. color permissive -#. +#. #. 1 #. 40000 @@ -14985,5 +15196,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -15020,5 +15231,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -15082,6 +15293,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 "nein" @@ -15227,6 +15439,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 "Typ" @@ -15497,7 +15709,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Fußgängerzone" +msgstr "Fußgänger" #. item "Ways/Cycleway" text "Width (meters)" @@ -15516,7 +15727,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Spikes / Dornen" +msgstr "Fahrräder" #. item "Ways/Footway" text "Width (meters)" @@ -15808,7 +16018,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 "Betreiber" @@ -16021,6 +16231,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 "Höhe" @@ -16932,7 +17142,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" @@ -16980,23 +17187,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 "Öffnungszeiten" @@ -17020,5 +17227,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" @@ -17065,24 +17271,24 @@ #: 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 "" +msgstr "24/7" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -17095,24 +17301,24 @@ #: 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 "" +msgstr "Mo-Fr 08:30-20:00" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -17125,22 +17331,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 "" @@ -17174,5 +17380,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 "Referenznummer" @@ -17192,7 +17398,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Park&Ride" +msgstr "Park and Ride" #. item "Tourism/Information Terminal" text "Reference number" @@ -17206,7 +17411,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapazität" +msgstr "Gesamtkapazität" #. item "Car/Parking" text "Capacity (overall)" @@ -17216,16 +17420,14 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Behindertenparkplätze" +msgstr "Stellplätze für Frauen" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Behindertenparkplätze" +msgstr "Stellplätze für Eltern" #: build/trans_presets.java:1400 msgid "See the Wiki for other capacity:[types]=*." -msgstr "" +msgstr "Siehe Wiki für weitere Werte capacity:[types]=*." #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." @@ -17423,5 +17625,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Schutzraum" @@ -17802,11 +18004,10 @@ #: build/trans_presets.java:1720 msgid "Detail Grade" -msgstr "" +msgstr "Detailgrad" #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stopp-Schild" +msgstr "topograhisch" #. color tertiary @@ -17849,28 +18050,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chinesisch" +msgstr "schematisch" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Bereich laden" +msgstr "Kartenausschnitt" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Einfügen" +msgstr "Örtlichkeit" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Großstadt" +msgstr "Stadt" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regional" +msgstr "Region" #. item "Tourism/Other Information Points" text "Name" @@ -17898,7 +18094,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Bergwanderweg" +msgstr "Mountainbike fahren" #. item "Tourism/Map" check "Mountainbiking" @@ -17912,7 +18107,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "Abstellgleis" +msgstr "Reiten" #. item "Tourism/Map" check "Riding" @@ -17920,5 +18114,5 @@ #: build/trans_presets.java:1730 build/trans_presets.java:1753 msgid "... other transportation modes possible" -msgstr "" +msgstr "...andere mögliche Transportarten" #. item "Tourism/Map" label "... other transportation modes possible" @@ -17929,13 +18123,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Grenzkontolle" +msgstr "Inhalt" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Anfänger" +msgstr "Notiz" #: build/trans_presets.java:1737 @@ -17952,40 +18144,34 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "Landfläche" +msgstr "Pflanzen" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Wegweiser (Wandern)" +msgstr "Wegweiser" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Information" +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 "Nähere Beschreibung" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "Audioguide" #. #: build/trans_presets.java:1775 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "Audioguide per Handy?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" msgstr "Telefonnummer" @@ -18311,5 +18497,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18343,5 +18529,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19467,6 +19653,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 "Religion" @@ -19475,66 +19661,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 "bahaiistisch" -#: 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 "buddhistisch" -#: 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 "christlich" -#: 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 "hinduistisch" -#: 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 "jainistisch" -#: 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 "jüdisch" -#: 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 "moslemisch" -#: 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 "sikhistisch" -#: 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 "spiritistisch" -#: 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 "taoistisch" -#: 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 "unitarisch" -#: 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 "zoroastrisch" -#: 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 "Konfession" @@ -19543,76 +19729,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 "anglikanisch" -#: 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 "baptistisch" -#: 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 "katholisch" -#: 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 "evangelikal" -#: 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 "Zeugen Jehovas" -#: 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 "lutherisch" -#: 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 "methodistisch" -#: 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 "mormonisch" -#: 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 "orthodox" -#: 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 "Pfingstgemeinde" -#: 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 "presbyterianisch" -#: 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 "protestantisch" -#: 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 "Quäker" -#: 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 "schiitisch" -#: 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 "sunnitisch" @@ -19944,5 +20130,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 "Kommentar" @@ -19967,5 +20153,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ünzen" @@ -19973,5 +20159,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 "Scheine" @@ -19979,5 +20165,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 "Geld- oder Prepaidkarten" @@ -19985,5 +20171,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 "Konto- oder EC-Karten" @@ -19991,5 +20177,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 "Kreditkarten" @@ -20048,10 +20234,144 @@ msgstr "Bank" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Zurück" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Gedenkstätte" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "Kein" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Ort" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Farbe" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Zurück" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "runter" + +#. 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 "Grün" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "Röhricht" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Wert" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "Örtlichkeit" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Leitungsanzahl" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Jagdanstand" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Jagdanstand bearbeiten" @@ -20060,30 +20380,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 "Höhe" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "niedrig" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "halb" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "voll" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Versteck" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Schloß" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Springbrunnen" @@ -20092,10 +20412,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Springbrunnen bearbeiten" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Trinkwasser" @@ -20104,10 +20424,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Trinkwasserabgabe bearbeiten" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Babyklappe" @@ -20115,35 +20435,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Babyklappe bearbeiten" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Geschäfte" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarkt" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Supermarkt bearbeiten" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Ferienhaus" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "Drogerie" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Ferienhaus bearbeiten" - -#: build/trans_presets.java:2478 +msgstr "Drogerie bearbeiten" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Tante-Emma-Laden" @@ -20151,9 +20469,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Tante-Emma-Laden bearbeiten" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -20161,29 +20479,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Kiosk bearbeiten" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "Buchhandlung" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Bushaltestelle bearbeiten" - -#: build/trans_presets.java:2498 +msgstr "Buchhandlung bearbeiten" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "Reisebüro" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Baum bearbeiten" - -#: build/trans_presets.java:2504 +msgstr "Reisebüro bearbeiten" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Verkaufsautomat" @@ -20191,5 +20507,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Automaten bearbeiten" @@ -20197,88 +20513,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Automatenprodukte" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "Fahrscheine" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "Pläne des öffentlichen Nahverkehrs" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "Parkscheine" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "Essen" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "Getränke" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "Süßigkeiten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "Zigaretten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "Tiernahrung" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "Zeitungen" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "Spielzeug" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "Briefmarken" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-Karten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "Telefonkarten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "Karten/Belege" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "Kondome" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "Tampons" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "Hundekot-Tüten" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Kundenkarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Fleischer" @@ -20286,9 +20602,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Fleischer bearbeiten" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Bäcker" @@ -20296,9 +20612,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Bäcker bearbeiten" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Blumenladen" @@ -20306,18 +20622,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Blumenladen bearbeiten" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Bioladen" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Bioladen bearbeiten" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Spirituosen" @@ -20325,54 +20641,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Spirituosengeschäft bearbeiten" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Getränke" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Getränkeladen bearbeiten" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Computergeschäft bearbeiten" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronikgeschäft" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Elektronikgeschäft bearbeiten" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Hifi-Geschäft bearbeiten" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Mobiliar" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Möbelgeschäft bearbeiten" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Gartenzentrum" @@ -20380,9 +20696,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Gartenzentrum bearbeiten" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Haushaltswaren" @@ -20390,9 +20706,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Haushaltswaren bearbeiten" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Heimwerkerbedarf" @@ -20400,54 +20716,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Geschäft für Heimwerkerbedarf bearbeiten" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Bürobedarf" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Bürobedarf bearbeiten" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Friseur" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Friseur bearbeiten" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Schuhe" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Schuhladen bearbeiten" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Spielzeug" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Spielzeuggeschäft bearbeiten" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Videoverleih" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Videogeschäft bearbeiten" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Chemische Reinigung" @@ -20455,9 +20771,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Chemische Reinigung bearbeiten" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Waschsalon" @@ -20465,9 +20781,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Waschsalon bearbeiten" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Camping (Outdoor)" @@ -20475,32 +20791,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten" -#: 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 "Sportgeschäft bearbeiten" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Optiker bearbeiten" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Geld" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -20508,14 +20824,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Bank bearbeiten" -#: 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 "Geldautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Wechselstube" @@ -20523,5 +20839,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Wechselstube bearbeiten" @@ -20529,15 +20845,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Geldautomat bearbeiten" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Gesundheit" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Arzt" @@ -20545,18 +20861,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Arzt bearbeiten" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Zahnarzt" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Zahnarzt bearbeiten" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apotheke" @@ -20564,5 +20880,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Apotheke bearbeiten" @@ -20570,9 +20886,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Rezepteinlösung" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Krankenhaus" @@ -20580,10 +20896,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Krankenhaus bearbeiten" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Notfallrettungspunkt" @@ -20592,5 +20908,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Notfallrettungspunkt bearbeiten" @@ -20599,20 +20915,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Punktname" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "(Internationale Nummer verwenden, z.B. +49-123-45678)" @@ -20620,5 +20936,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 "Tierarzt" @@ -20627,55 +20943,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Tierarzt bearbeiten" #. 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 "Kontinent bearbeiten" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Staat" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Staat bearbeiten" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Bundesland" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Bundesland bearbeiten" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Region bearbeiten" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Landkreis" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Landkreis bearbeiten" @@ -20683,15 +20999,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Großstadt" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Großstadt bearbeiten" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Stadt" @@ -20699,10 +21015,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Stadt bearbeiten" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Stadtteil" @@ -20710,25 +21026,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Stadtteil bearbeiten" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Dorf" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Dorf bearbeiten" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Weiler" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Weiler bearbeiten" @@ -20736,5 +21052,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Unbewohnter Ort" @@ -20742,10 +21058,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Unbewohnten Ort bearbeiten" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Insel" @@ -20753,24 +21069,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Insel bearbeiten" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "links" +msgstr "Kleine Insel" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Ferienhaus bearbeiten" +msgstr "Kleine Insel bearbeiten" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Höhleneingang" @@ -20778,10 +21092,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Höhleneingang bearbeiten" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Bergspitze" @@ -20789,10 +21103,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Bergspitze bearbeiten" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Gletscher" @@ -20800,10 +21114,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Gletscher bearbeiten" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkan" @@ -20811,70 +21125,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Vulkan bearbeiten" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Staat" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Staatsgrenze bearbeiten" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Innerstaatlich" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Innerstaatliche Grenze bearbeiten" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Zivil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Zivilrechtliche Grenze bearbeiten" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politisch" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Politische Grenze bearbeiten" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Nationalparkgrenze bearbeiten" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Landnutzung" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Baum" @@ -20883,15 +21197,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Baum bearbeiten" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanischer Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Naturwald" @@ -20900,5 +21214,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Naturwald bearbeiten" @@ -20906,17 +21220,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 "Nadelwald" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "Laubwald" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "Mischwald" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Forst" @@ -20925,14 +21239,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Forst bearbeiten" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Naturdenkmal & Reservat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Naturdenkmal oder Reservat bearbeiten" @@ -20940,25 +21254,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Geröll" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Geröll bearbeiten" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Buschland" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Buschland bearbeiten" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Gebirge" @@ -20966,10 +21280,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Gebirge bearbeiten" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Heide" @@ -20977,5 +21291,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Heide bearbeiten" @@ -20983,5 +21297,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Bauernhof" @@ -20990,45 +21304,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Bauernhof bearbeiten" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Ackerland" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Ackerland bearbeiten" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Wiese" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Wiese bearbeiten" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Weinberg" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Weinberg bearbeiten" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Schrebergärten" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Schrebergärten bearbeiten" @@ -21036,25 +21350,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Garten" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Garten bearbeiten" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Gras" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Grasfläche bearbeiten" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Dorfanger" @@ -21062,10 +21376,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Dorfanger bearbeiten" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Öffentlicher Bereich" @@ -21073,20 +21387,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Öffentlichen Bereich bearbeiten" #. 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 "Park bearbeiten" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Erholungsgebiet" @@ -21094,5 +21408,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Erholungsgebiet bearbeiten" @@ -21100,15 +21414,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Wohngebiet" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Wohngebiet bearbeiten" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Kleiner Friedhof" @@ -21116,9 +21430,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Kleinen Friedhof bearbeiten" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Friedhof" @@ -21126,39 +21440,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Friedhof bearbeiten" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Einkaufsbereich" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Einkaufsbereich bearbeiten" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Gewerbegebiet" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Gewerbegebiet bearbeiten" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industrie" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Industriegebiet bearbeiten" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Eisenbahngelände" @@ -21166,15 +21480,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Eisenbahngelände bearbeiten" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militärgebiet" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Militärgebiet bearbeiten" @@ -21182,55 +21496,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Baustellengebiet" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Baustelle bearbeiten" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Baulücke" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Baulücke bearbeiten" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Bauland" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Bauland bearbeiten" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Deponie" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Deponie bearbeiten" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Steinbruch" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Steinbruch bearbeiten" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -21240,5 +21554,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 "Ein Multipolygon bearbeiten" @@ -21247,10 +21561,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "Äußeres Segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "Inneres Segment" @@ -21258,5 +21572,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Abbiegeeinschränkung" @@ -21265,5 +21579,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Abbiegeeinschränkung bearbeiten" @@ -21271,34 +21585,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Einschränkung" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "Nicht links abbiegen" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "Nicht rechts abbiegen" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "Nicht geradeaus" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "Wendeverbot" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "Nur rechts abbiegen" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "Nur links abbiegen" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "Nur geradeaus" @@ -21307,15 +21621,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "Von Weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "Über Knoten oder Weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "Zu Weg" @@ -21323,5 +21637,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Route" @@ -21330,5 +21644,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Route bearbeiten" @@ -21336,5 +21650,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Routentyp" @@ -21342,5 +21656,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21406,5 +21720,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 @@ -21413,17 +21727,17 @@ msgstr "Fahrrad" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "Bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "Straße" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "Fähre" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "Ski" @@ -21476,5 +21790,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 @@ -21483,13 +21797,13 @@ msgstr "Fuß" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "Wandern" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "Straßenbahn" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "Umleitung" @@ -21503,10 +21817,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "U-Bahn" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Symbolbeschreibung" @@ -21514,31 +21828,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Netzwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "Route state" msgstr "Routenstatus" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "proposed" msgstr "geplant" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporär" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "Verbindung" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Farbe (hex)" @@ -21547,30 +21861,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "Routenabschnitt" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "Vorwärts-Abschnitt" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "Rückwärts-Abschnitt" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "Haltepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "Vorwärts-Haltepunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "Rückwärts-Haltepunkt" @@ -24723,76 +25037,4 @@ msgstr "Historisch" -#. 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 "Grün" - #. color green #. @@ -25760,16 +26002,59 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Alle Wege sind leer" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" + +#~ msgid "Merge Anyway" +#~ msgstr "Trotzdem vereinen" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." - -#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ "Die gewählten Punkte gehören unterschiedlichen Relationen an. Sollen Sie " +#~ "wirklich vereint werden?" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "Kein geöffnetes Changeset vorhanden. Öffne neues Changeset..." + +#~ msgid "Reusing existing changeset {0}" +#~ msgstr "Changeset {0} wiederverwenden" + +#~ msgid "Unknown version" +#~ msgstr "Unbekannte Version" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Fehlende Versionsnummer in OSM-Daten" + +#~ msgid "Found element in non-way." +#~ msgstr "Ein Element in einem Nicht-Weg gefunden." + +#~ msgid " has zero ref" +#~ msgstr " hat Null ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "-Schlüssel bei einer Nicht-Relation gefunden." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "" -#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" +#~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " +#~ "Relation {1}" + +#~ msgid "Ill-formed node id" +#~ msgstr "Falsch formatierte Knoten-ID" #~ msgid "" @@ -25783,27 +26068,135 @@ #~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." + +#~ msgid "Copy Default" +#~ msgstr "Standard kopieren" + +#~ msgid "map" +#~ msgstr "Karte" + +#~ msgid "citymap" +#~ msgstr "Stadtplan" + +#~ msgid "hikingmap" +#~ msgstr "Wanderkarte" + +#~ msgid "bicyclemap" +#~ msgstr "Fahrradkarte" + +#~ msgid "board" +#~ msgstr "Infotafel" + +#~ msgid "Delete {1} {0}" +#~ msgstr "{1} {0} löschen" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autoren: {0}" + +#~ msgid "Public" +#~ msgstr "Öffentlich" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Montagetabelle wählen" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." + +#~ msgid "Delete Layer" +#~ msgstr "Ebene löschen" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie " +#~ "vorm Hochladen alles." + +#~ msgid "Continue anyway" +#~ msgstr "Trotzdem fortfahren" + +#~ msgid "Edit Information Office" +#~ msgstr "Informationsbüro bearbeiten" + +#~ msgid "Map Type" +#~ msgstr "Kartentyp" + +#~ msgid "Board Type" +#~ msgstr "Tafeltyp" + +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Position des WMS-Layers justieren (nur Rasterbilder)" + +#~ msgid "nodes" +#~ msgstr "Knotenpunkte" + +#~ msgid "ways" +#~ msgstr "Wege" + +#~ msgid "relations" +#~ msgstr "Relationen" + +#~ msgid "changesets" +#~ msgstr "Änderungsätze" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Das Laden der Historie vom Server ist fehlgeschlagen. Details:
" +#~ "{0}" + #~ msgid "Change {0} {1}" #~ msgstr "{0} {1} ändern" -#~ msgid "Delete {1} {0}" -#~ msgstr "{1} {0} löschen" - #~ msgid "Remove relation member {0} {1}" #~ msgstr "Relationselement {0} {1} entfernen" -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" - -#~ msgid "nodes" -#~ msgstr "Knotenpunkte" - -#~ msgid "ways" -#~ msgstr "Wege" - -#~ msgid "relations" -#~ msgstr "Relationen" - -#~ msgid "changesets" -#~ msgstr "Änderungsätze" +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " +#~ "Ausnahme war: {0}" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Lösche Ebene {0} von {1}" + +#~ msgid "Delete all" +#~ msgstr "Alle löschen" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem " +#~ "löschen?" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem " +#~ "timeout durch den Server geschlossen. Die Fehlermeldung war: {1}" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" #~ msgid "" @@ -25812,4 +26205,15 @@ #~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " #~ "Fehlermeldung ist: {0}" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " +#~ "Fehlermeldung ist: {0}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" #~ msgid "" @@ -25821,59 +26225,8 @@ #~ msgid "" -#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -#~ "Exception: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Das Laden der Historie vom Server ist fehlgeschlagen. Details:
" -#~ "{0}" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem " -#~ "löschen?" - -#~ msgid "Delete Layer" -#~ msgstr "Ebene löschen" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?" - -#~ msgid "Delete all" -#~ msgstr "Alle löschen" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Lösche Ebene {0} von {1}" - -#~ msgid "" -#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" - -#~ msgid "" #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" #~ msgstr "" #~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " #~ "Fehlermeldung ist: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Autoren: {0}" - -#~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" -#~ msgstr "" -#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " -#~ "Ausnahme war: {0}" #~ msgid "" @@ -25883,59 +26236,4 @@ #~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" -#~ msgid "" -#~ "Failed to close changeset {0}, will be closed by server after timeout. " -#~ "Exception was: {1}" -#~ msgstr "" -#~ "Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem " -#~ "timeout durch den Server geschlossen. Die Fehlermeldung war: {1}" - -#~ msgid "Public" -#~ msgstr "Öffentlich" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" - #~ msgid "Set Lambert coordinate" #~ msgstr "Lambertkoordinaten eingeben" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie " -#~ "vorm Hochladen alles." - -#~ msgid "Continue anyway" -#~ msgstr "Trotzdem fortfahren" - -#~ msgid "Copy Default" -#~ msgstr "Standard kopieren" - -#~ msgid "Edit Information Office" -#~ msgstr "Informationsbüro bearbeiten" - -#~ msgid "Map Type" -#~ msgstr "Kartentyp" - -#~ msgid "map" -#~ msgstr "Karte" - -#~ msgid "citymap" -#~ msgstr "Stadtplan" - -#~ msgid "hikingmap" -#~ msgstr "Wanderkarte" - -#~ msgid "bicyclemap" -#~ msgstr "Fahrradkarte" - -#~ msgid "Board Type" -#~ msgstr "Tafeltyp" - -#~ msgid "board" -#~ msgstr "Infotafel" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Montagetabelle wählen" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Position des WMS-Layers justieren (nur Rasterbilder)" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 17594) +++ /applications/editors/josm/i18n/po/el.po (revision 17595) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" "PO-Revision-Date: 2009-07-09 11:26+0000\n" "Last-Translator: alichani \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:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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 "Βοήθεια" -#: ../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 "" -#: ../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 "Σφάλμα" -#: ../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] "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;" -msgstr[1] "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Μη αποθηκευμένες αλλαγές" -#: ../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 "Αποθήκευση και Έξοδος" -#: ../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 "Απόρριψη και Έξοδος" -#: ../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 "Ακύρωση" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{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 "Προειδοποίηση" -#: ../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 "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{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 "Πρόσθετα" @@ -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 "Πληροφορίες" @@ -548,5 +550,5 @@ msgstr "Παρακαλώ επιλέξτε τουλάχιστον τρείς κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -557,10 +559,10 @@ "{0}, μέγιστος είναι {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" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -569,5 +571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -576,9 +578,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Παραβίαση Προυποθέσεων" -#: ../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}" @@ -633,26 +635,22 @@ msgstr "Καμοία διένεξη για να γίνει ζουμ" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "" - -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Επιβεβαίωση συνδυασμού" -#: ../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 " @@ -660,13 +658,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Αλλαγή κατευθήνσεων;" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Αντισροφή και Συνδυασμός" -#: ../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 " @@ -674,29 +672,17 @@ msgstr "" -#: ../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 "Εισάγετε τιμές για όλες τισ διενέξεις." - -#: ../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 "Επίλυση διενέξεων" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Όλοι οι δρόμοι ήταν άδειοι" - -#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." msgstr "" @@ -751,5 +737,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 "Διαγραφή" @@ -759,15 +745,15 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων." -#: ../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 "Αντικατάσταση" -#: ../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 "Το αρχείο υπάρχει. Αντικατάσταση;" @@ -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 "Όλες οι εικόνες" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1008,1036 +993,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 "Συγχώνευση Κόμβων" -#: ../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 "Συγχώνευση κόμβων στον παλαιότερο." -#: ../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 "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Συγχώνευση κόμβων με διαφορετικές συμμετοχές;" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Επιβεβαίωση συγχώνευσης" - -#: ../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 "" -"Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να τους " -"συγχωνεύσετε;" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Συγχώνευση {0} κόμβων" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Καθρεπτισμός" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "επάνω" - -#: ../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 "Μετακίνηση αντικειμένων {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "κάτω" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "αριστερά" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "δεξιά" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Μετακίνηση {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Μεταφέρει αντικείμενα {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 "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." - -#: ../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 "Νέα" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Δημιοθργία καινούργιου χάρτη" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Άνοιγμα..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Άνοιγμα αρχείου." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Άνοιγμα αρχείου." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Άγνωστος ρόλος \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Άνοιγμα Τοποθεσίας..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Άνοιγμα URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Ξεχωριστό Επίπεδο" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Εισάγετε URL προς λήψη:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Προορισμός Λήψης" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Λήψη URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ορθογωνισμός Σχήματος" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Επιτρέπονται μόνο δύο κόμβοι" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον " -"τέσσερις κόμβους." - -#: ../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 "Μόνο ένας κόμβος επιλέχθηκε" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ορθογωνισμός" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "Επικόλληση" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Επικόληση περιεχομένων πρόχειρου." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Επικόλληση ετικετών" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Φόρτωση {0}" -msgstr[1] "Φόρτωση {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, 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 "Προτιμήσεις..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Άνοιξε τις προτιμήσεις για μια σελίδα για παγκόσμιες ρυθμίσεις." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Προτιμήσεις" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Επανάληψη" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Επανάληψη της τελευταίας αναίρεσης." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Μετονομασία επιπέδου" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Επιπλέον μετονομασία του αρχείου" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "" - -#: ../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 "Αποθήκευση" - -#: ../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 "Αποθήκευση τεχόντων δεδομένων." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Το αρχείο {0} υπάρχει. Επικάλυψη;" - -#: ../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 "Κενό έγγραφο" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Το έγγραφο δεν περιέχει δεδομένα." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Επιβεβαίωση αποθήκευσης" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Συγκρούσεις" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Απόρριψη διενέξεων και Αποθήκευση" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Αποθήκευση αρχείου OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Αποθήκευση αρχείου GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Αποθήκευση Επιπέδου" - -#: ../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 "Αποθήκευση ως..." - -#: ../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 "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Επιλογή Όλων" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Προβολή Αναφοράς Κατάστασης" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να " -"επισυναφθούν σε σφάλματα" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Βοήθεια: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Αναφορά Κατάστασης" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο" - -#: ../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 "Κλείσιμο" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση." - -#: ../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] "" -msgstr[1] "" - -#: ../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] "" -"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τον κόμβο που " -"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο." -msgstr[1] "" -"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τους κόμβους που " -"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "" - -#: ../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] "" -msgstr[1] "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Κλείσιμο πακέτου αλλαγών" - -#: ../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 "Κλείσιμο πακέτου αλλαγών" - -#: ../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 "Άνοιγμα πακέτου αλλαγών..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Σχεδιασμός γραμμών ανάμεσα σε ακατέργαστα σημεία GPS." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Επιλέξτε οποιοδήποτε:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Ένας κόμβος με ετικέτα, ή" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" -"* Ένας δρόμος και ένα ή περισσότερα από τους κόμβους του που " -"χρησιμοποιούνται από περισσότερο από έναν δρόμο." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Ξεκολημένος Κόμβος" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Αντιγραφή σε {0} κόμβους" - -#. 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 "Αντιγραφή {0} κόμβων σε {1} κόμβους" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Αναίρεση" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Αναίρεση της τελευταίας ενέργειας." - -#: ../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 "Αποεπιλογή όλων" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Αποεπιλογή όλων των αντικειμένων" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Ενημέρωση Δεδομένων" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Ενημερώνει το τρέχον επίπεδο δεδομένων από τον διακομιστή (επαναλαμβάνει την " -"λήψη δεδομένων)" - -#. 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 "" - -#: ../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 "Ενημέρωση Επιλογής" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Κενή επιλογή" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Αποστολή προς OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." - -#: ../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 "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Συγχρονισμός μόνο {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 "" - -#: ../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 "" - -#. 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 "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" - -#: ../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 "" -"Προειδοποίηση: η επικεφαλίδα σφάλματος \"{0}\" δεν συμπίπτει με τo " -"αναμενόμενο πρότυπο \"{1}\"" - -#: ../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 "Η αποστολή στο OSM API απέτυχε" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Να αποσταλούν αυτές οι αλλαγές;" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Αποστολή Αλλαγών" - -#: ../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 -msgid "Upload to a new or to an existing changeset?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Ρυθμίσεις Χάρτη" - -#: ../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 "Αντικείμενα που θα προστεθούν:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Αντικείμενα που θα αλλαχτούν" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Αντικείμενα που θα διαγραφούν:" - -#: ../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] "Αντικείμενα που θα προστεθούν:" -msgstr[1] "Αντικείμενα που θα προστεθούν:" - -#: ../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] "Αντικείμενα που θα αλλαχτούν" -msgstr[1] "Αντικείμενα που θα αλλαχτούν" - -#: ../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] "Αντικείμενα που θα διαγραφούν:" -msgstr[1] "Αντικείμενα που θα διαγραφούν:" - -#: ../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 "Τελεταία αλλαγή στις {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Μεγέθυνση" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Σμίκρυνση" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Πίσω" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Άλμα πίσω." - -#: ../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 "Ήχος: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Πιο γρήγορα" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Γρηγορότερα μπροστά" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Εμπρός" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Άλμα μπροστά" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Επόμενο σημάδι" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Αναπαραγωγή επόμενου σημαδιού" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Αναπαραγωγή/παύση" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Αναπαραγωγή/παύση ήχου." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Προηγούμενο σημάδι" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Αναπαραγωγή προηγούμενου σημαδιού." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Πιο αργά" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Πιο αργά μπροστά" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Λήψη δεδομένων GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Λήψη Δεδομένων GPX" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Ακατέργαστα δεδομένα GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Λήψη δεδομένων" - -#: ../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 "Δεν εισήχθησαν δεδομένα" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Δεδομένα OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Λήψη {0} από {1} (απομένουν {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Σφάλματα κατά την λήψη" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Κατάσταση Διαγραφής" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "" - -#: ../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 "Κατάσταση: {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 @@ -2048,7 +1022,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 @@ -2057,6 +1032,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 @@ -2087,4 +1062,881 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Συγχώνευση {0} κόμβων" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Καθρεπτισμός" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "επάνω" + +#: ../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 "Μετακίνηση αντικειμένων {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "κάτω" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "αριστερά" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "δεξιά" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Μετακίνηση {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Μεταφέρει αντικείμενα {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 "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." + +#: ../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 "Νέα" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Δημιοθργία καινούργιου χάρτη" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Άνοιγμα..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Άνοιγμα αρχείου." + +#: ../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 "Άνοιγμα Τοποθεσίας..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Άνοιγμα URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Ξεχωριστό Επίπεδο" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Εισάγετε URL προς λήψη:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Προορισμός Λήψης" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Λήψη URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ορθογωνισμός Σχήματος" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Επιτρέπονται μόνο δύο κόμβοι" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον " +"τέσσερις κόμβους." + +#: ../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 "Μόνο ένας κόμβος επιλέχθηκε" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ορθογωνισμός" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "Επικόλληση" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Επικόληση περιεχομένων πρόχειρου." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Επικόλληση ετικετών" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" + +#: ../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 "Προτιμήσεις..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Άνοιξε τις προτιμήσεις για μια σελίδα για παγκόσμιες ρυθμίσεις." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Επανάληψη" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Επανάληψη της τελευταίας αναίρεσης." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Μετονομασία επιπέδου" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Επιπλέον μετονομασία του αρχείου" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "" + +#: ../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 "Αποθήκευση" + +#: ../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 "Αποθήκευση τεχόντων δεδομένων." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Το αρχείο {0} υπάρχει. Επικάλυψη;" + +#: ../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 "Κενό έγγραφο" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Επιβεβαίωση αποθήκευσης" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Το έγγραφο δεν περιέχει δεδομένα." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Συγκρούσεις" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Απόρριψη διενέξεων και Αποθήκευση" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Αποθήκευση αρχείου OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Αποθήκευση αρχείου GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Αποθήκευση Επιπέδου" + +#: ../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 "Αποθήκευση ως..." + +#: ../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 "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Επιλογή Όλων" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Προβολή Αναφοράς Κατάστασης" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να " +"επισυναφθούν σε σφάλματα" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Βοήθεια: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Αναφορά Κατάστασης" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο" + +#: ../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 "Κλείσιμο" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση." + +#: ../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] "" +msgstr[1] "" + +#: ../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] "" +"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τον κόμβο που " +"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο." +msgstr[1] "" +"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τους κόμβους που " +"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "" + +#: ../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] "" +msgstr[1] "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Σχεδιασμός γραμμών ανάμεσα σε ακατέργαστα σημεία GPS." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Επιλέξτε οποιοδήποτε:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Ένας κόμβος με ετικέτα, ή" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" +"* Ένας δρόμος και ένα ή περισσότερα από τους κόμβους του που " +"χρησιμοποιούνται από περισσότερο από έναν δρόμο." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Ξεκολημένος Κόμβος" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Αντιγραφή σε {0} κόμβους" + +#. 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 "Αντιγραφή {0} κόμβων σε {1} κόμβους" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Αναίρεση" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Αναίρεση της τελευταίας ενέργειας." + +#: ../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 "Αποεπιλογή όλων" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Αποεπιλογή όλων των αντικειμένων" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Ενημέρωση Δεδομένων" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Ενημερώνει το τρέχον επίπεδο δεδομένων από τον διακομιστή (επαναλαμβάνει την " +"λήψη δεδομένων)" + +#. 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 "" + +#: ../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 "Ενημέρωση Επιλογής" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Κενή επιλογή" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Αποστολή προς OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." + +#: ../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 "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Συγχρονισμός μόνο {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 "" + +#: ../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 "" + +#. 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 "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" + +#: ../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 "" +"Προειδοποίηση: η επικεφαλίδα σφάλματος \"{0}\" δεν συμπίπτει με τo " +"αναμενόμενο πρότυπο \"{1}\"" + +#: ../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 "Η αποστολή στο OSM API απέτυχε" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Μεγέθυνση" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Σμίκρυνση" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Πίσω" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Άλμα πίσω." + +#: ../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 "Ήχος: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Πιο γρήγορα" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Γρηγορότερα μπροστά" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Εμπρός" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Άλμα μπροστά" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Επόμενο σημάδι" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Αναπαραγωγή επόμενου σημαδιού" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Αναπαραγωγή/παύση" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Αναπαραγωγή/παύση ήχου." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Προηγούμενο σημάδι" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Αναπαραγωγή προηγούμενου σημαδιού." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Πιο αργά" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Πιο αργά μπροστά" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Λήψη δεδομένων GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Λήψη Δεδομένων GPX" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Ακατέργαστα δεδομένα GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Λήψη δεδομένων" + +#: ../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 "Δεν εισήχθησαν δεδομένα" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Δεδομένα OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Λήψη {0} από {1} (απομένουν {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Σφάλματα κατά την λήψη" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Κατάσταση Διαγραφής" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "" + +#: ../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 "Κατάσταση: {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 +2053,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 "Επιλέξτε" -#: ../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 +2073,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 +2093,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 "" @@ -2410,41 +2262,41 @@ msgstr "Αναζήτηση" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../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 "Δεν βρέθηκε αποτέλεσμα για ''{0}''" -#: ../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 "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../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 "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../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 "Βρέθηκαν {0} αποτελέσματα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2454,40 +2306,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 "" -#: ../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 "" @@ -2496,5 +2348,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." @@ -2531,7 +2383,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Προσθήκη κόμβου" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2541,52 +2393,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Σχέσεις: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Αλλαγή {0} αντικειμένου" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Τελεταία αλλαγή στις {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Αλλαγή σχέσης" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Αφαίρεση \"{0}\" για {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Αφαίρεση \"{0}\" για {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Αφαίρεση \"{0}\" για {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Ρύθμιση {0}={1} για {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Ρύθμιση {0}={1} για {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Ρύθμιση {0}={1} για {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2656,30 +2508,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] "Διαγραφή {0} {1}" -msgstr[1] "Διαγραφή {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] "Κατάσταση Διαγραφής" -msgstr[1] "Κατάσταση Διαγραφής" +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] "Διαγραφή {0} {1}" -msgstr[1] "Διαγραφή {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] "Διαγραφή από σχέση" -msgstr[1] "Διαγραφή από σχέση" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2693,20 +2545,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Η επιλογή \"{0}\" χρησιμοποιείται από την σχέση \"{1}\" με ρόλο {2}.\n" -"Διαγραφή από την σχέση;" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Η επιλογή \"{0}\" χρησιμοποιείτε από την σχέση \"{1}\"\n" -"Διαγραφή απο την σχέση;" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2717,5 +2565,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." @@ -2796,17 +2644,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2816,17 +2664,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Επίλυση συγκρούσεων" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Αφαίρεση αναφοράς από την σχέση {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2962,11 +2810,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας στο " -"{0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3033,5 +2879,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 @@ -3039,23 +2885,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 +#, java-format +msgid "paramete''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Σφάλμα: {0}" -#: ../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 "Προειδοποίηση: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" + +#: ../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 @@ -3068,11 +2939,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 "" @@ -3123,9 +2999,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." @@ -3134,118 +3010,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 "Διαγράφηκε το μέλος ''{0}'' της σχέσης." -#: ../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 "Άγνωστος ρόλος \"{0}\"." -#: ../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 "Άγνωστος τύπος μέλους για το \"{0}\"" -#: ../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 "Εσωτερικός δρόμος \"{0}\" είναι από έξω." -#: ../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 "κείμενο" @@ -3268,5 +3144,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" @@ -3277,5 +3153,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" @@ -3286,5 +3162,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" @@ -3398,5 +3274,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "σιδηρόδρομος" @@ -3428,127 +3304,33 @@ msgstr[1] "{0} μέλη" -#: ../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 "άγνωστο" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Άγνωστος υπολογιστής" -#: ../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 "" @@ -3765,5 +3547,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}" @@ -4142,4 +3924,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 @@ -4212,8 +3996,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 @@ -4336,5 +4120,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 "διαγράφηκε" @@ -4394,5 +4178,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 "Όχι, ακύρωση" @@ -4434,4 +4218,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 @@ -4445,5 +4230,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 "" @@ -4549,4 +4334,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 "Καμοία διένεξη για να γίνει ζουμ" + +#: ../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 @@ -4559,24 +4380,23 @@ msgstr "όλα" -#: ../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 "Επιλέξτε ένα χρώμα" - -#: ../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}''" @@ -4597,15 +4417,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../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 +msgstr "" + +#: ../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 "Δεν έχει υλοποιηθεί ακόμη." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4618,7 +4438,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Διαγραφή από σχέση" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4646,24 +4465,8 @@ msgstr[1] "{0} σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Επίλυση σύγκρουσης" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Επίλυση συγκρούσεων" - -#: ../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 "Επικόλληση" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4678,9 +4481,75 @@ #: ../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} τροχιά, " -msgstr[1] "{0} τροχιές, " +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 "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" + +#: ../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 "Τζάκι" + +#: ../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 +#, fuzzy +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 "Τιμή" + +#: ../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 "Μονόδρομος" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Αναθεώρηση" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4707,5 +4576,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}" @@ -4738,5 +4607,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." @@ -4809,13 +4678,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 "Επίπεδο: {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 "Σχέσεις: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4901,5 +4770,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 "<διαφορετικά>" @@ -4959,5 +4828,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 "Προσθήκη" @@ -5007,5 +4876,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 "Σχέσεις" @@ -5101,9 +4970,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] "Συγγραφέας" -msgstr[1] "Συγγραφέας" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5112,12 +4981,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Προβολή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5198,5 +5065,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}" @@ -5214,9 +5081,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 "" @@ -5467,11 +5329,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 "" @@ -5485,7 +5347,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Φόρτωση πρόσθετων" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5613,5 +5474,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Τοποθεσίες" @@ -5692,5 +5553,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 "" @@ -5721,17 +5582,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Ιστορικό για {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Ιστορικό για {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Ιστορικό για {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5740,7 +5601,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Αποστολή των τρεχουσών προτιμήσεων στον διακομιστή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5778,17 +5638,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Φόρτωση ιστορικού" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Φόρτωση ιστορικού" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Αφαίρεση αναφοράς από την σχέση {0}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6623,52 +6483,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 "Όνομα" @@ -6678,21 +6538,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 "Αλλαγή σχέσης" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Τελεταία αλλαγή στις {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6710,7 +6568,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Όνομα οδού" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6751,7 +6608,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Παρακαλώ επιλέξτε μια τιμή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6801,6 +6657,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Διόρθωση συγκρούσεων ετικετών" +msgid "Unsaved data and conflicts" +msgstr "Επίλυση συγκρούσεων" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6817,5 +6673,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 "" @@ -6834,5 +6690,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6846,7 +6702,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Απόρριψη και Έξοδος" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6859,7 +6714,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Αποθήκευση και Έξοδος" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6937,7 +6791,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Κατά την αποστολή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6946,12 +6799,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" + +#: ../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 "Αντικείμενα που θα προστεθούν:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Αντικείμενα που θα αλλαχτούν" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Αντικείμενα που θα διαγραφούν:" + +#: ../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 "Αποστολή Αλλαγών" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Αρχείο" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Να αποσταλούν αυτές οι αλλαγές;" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Γίνεται αποστολή" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία." + +#: ../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 @@ -7188,5 +7170,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." @@ -7244,7 +7225,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Λήψη δεδομένων" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7306,4 +7286,13 @@ msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" + +#: ../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 "" +"Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε " +"βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7496,5 +7485,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 "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." @@ -7951,7 +7940,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Εμφάνιση ID αντικειμένου στις λίστες επιλογών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7966,7 +7954,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Εμφάνιση ID αντικειμένου στις λίστες επιλογών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8321,8 +8308,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!" @@ -8379,5 +8362,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 @@ -8388,42 +8371,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Προσθήκη νέου επιπέδου" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Διαγραφή του επιλεγμένου επιπέδου." - -#: ../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 "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" #. 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 "" -#: ../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 "Χρήση προεπιλογής \"{0}\" από ομάδα \"{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 "Χρήση προεπιλογής \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "Άγνωστος τύπος: {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 @@ -8434,15 +8415,15 @@ msgstr "" -#: ../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 "Σφάλμα ανάλυσης {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 "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../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 @@ -8452,18 +8433,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../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 "Τίποτα επιλεγμένο!" -#: ../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 "Αλλαγή ιδιοτήτων" @@ -8490,5 +8471,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, πιθανόν να λείπουν κάποιες ετικέτες" @@ -8504,7 +8484,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 @@ -8582,5 +8559,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}" @@ -8588,5 +8565,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" @@ -8594,5 +8571,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" @@ -8613,6 +8589,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 @@ -8622,40 +8598,40 @@ msgstr "Μεταφόρτωση δεδομένων OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8717,10 +8693,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 "" @@ -8728,11 +8704,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 "Άνοιγμα πακέτου αλλαγών..." - -#: ../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}" @@ -8740,34 +8714,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 "Άνοιγμα πακέτου αλλαγών..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Άνοιγμα πακέτου αλλαγών..." - -#: ../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 "Άνοιγμα πακέτου αλλαγών..." - -#: ../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 " @@ -8775,44 +8733,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../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 "Κλείσιμο πακέτου αλλαγών" - -#: ../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 "Άνοιγμα πακέτου αλλαγών..." - -#: ../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 "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Αποστολή..." -#: ../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}." @@ -8831,10 +8789,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 "" @@ -8894,6 +8852,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" @@ -8922,5 +8885,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 "" @@ -8977,74 +8940,139 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Άγνωστη έκδοση" - -#: ../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 "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Άγνωστη έκδοση: {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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " έχει μηδενική αναφορά" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Βρέθηκε στοιχείο εκτός σχέσης." - -#: ../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 "" -#: ../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 "Άγνωστο αντικείμενο με 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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Άγνωστη έκδοση: {0}" + +#: ../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 "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{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 "" @@ -9053,16 +9081,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 "Προετοιμασία δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Κακοσχηματισμένο id κόμβου" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Προετοιμασία δεδομένων OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Προετοιμασία δεδομένων..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9109,33 +9151,43 @@ "Internet." -#: ../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} απομένουν. Αποστολή {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} απομένουν. Αποστολή {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} απομένουν. Αποστολή {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 "Αποστολή..." + +#: ../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 "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9174,12 +9226,7 @@ msgstr "Λήψη πρόσθετου {0}..." -#: ../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 "Απαιτείται η έκδοση {0} του JOSM για το πρόσθετο {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9191,4 +9238,9 @@ msgstr "Παράλειψη Λήψης" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Απαιτείται η έκδοση {0} του JOSM για το πρόσθετο {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9231,21 +9283,21 @@ #: ../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 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" - -#: ../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:178 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -9255,5 +9307,9 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../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 "" @@ -9263,10 +9319,10 @@ "''{0}''." -#: ../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 "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." -#: ../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." @@ -9275,9 +9331,9 @@ "κάντε αναφορά για bug." -#: ../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 " @@ -9287,13 +9343,13 @@ "να αποφορτωθεί το πρόσθετο." -#: ../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" @@ -9349,4 +9405,35 @@ "\n" "{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 "άγνωστο" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9423,4 +9510,88 @@ msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)" +#: ../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 @@ -9491,5 +9662,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9498,5 +9669,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9505,5 +9676,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9512,5 +9683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9519,5 +9690,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9576,40 +9747,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}" @@ -9617,47 +9787,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 "Η αποστολη GPX ήταν επιτυχής" -#: ../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 "Αποστολή ίχνους GPX : {0}% ({1} από {2})" -#: ../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 "Αποστολή Ίχνους GPX" @@ -9872,5 +10042,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 "" @@ -9884,13 +10054,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 "Πρέπει να επιλέξετε ένα ίχνος GPX" -#: ../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 "Δεν επιλέχθηκε ίχνος GPX" -#: ../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 "" @@ -9899,9 +10069,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 "" @@ -9910,65 +10080,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 "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" -#: ../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 "Ζώνη ώρας: {0}" -#: ../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 "Λεπτά: {0}" -#: ../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 "Δευτερόλεπτα: {0}" -#: ../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 "(Διαφορά ώρας {0} ημερών)" -#: ../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 "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" -#: ../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 " @@ -9976,13 +10146,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 "" @@ -10020,5 +10190,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 "Σφάλμα φόρτωσης αρχείου" @@ -10065,13 +10235,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" @@ -10080,13 +10250,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 "" @@ -10200,9 +10370,9 @@ "Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος" -#: ../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 "Προσθήκη \"source=...\" στα στοιχεία;" @@ -10310,7 +10480,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "φόρτωση εικόνας..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10356,7 +10525,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Επιλέξτε" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10443,5 +10611,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 "Άδειο επίπεδο" @@ -11377,18 +11545,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}" @@ -11399,5 +11567,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11407,9 +11575,9 @@ "σελίδα Ρυθμίσεις Χάρτη από τις επιλογές." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "επιλογές osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "εκτελέσιμο Firefox" @@ -11420,28 +11588,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Δημιοθργία νέου κόμβου." + +#: ../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 " @@ -11450,28 +11623,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 "" @@ -11962,25 +12141,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Εισάγετε τιμές για όλες τισ διενέξεις." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Επίλυση διενέξεων" + #: ../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 "" @@ -12052,6 +12239,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 "Σφάματα επαλήθευσης" @@ -12061,10 +12248,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 "" @@ -12153,51 +12340,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 "Αποστολή..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12229,7 +12430,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Δημιουργία κτηρίων" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12237,19 +12437,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 -#, fuzzy +#: ../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 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12257,7 +12456,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 "Αντιγραφή" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12268,7 +12466,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Αντιγραφή" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12835,5 +13032,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Δημιοθργήθηκε εξαίρεση" @@ -12917,5 +13114,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 " @@ -12923,5 +13120,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 "" @@ -12939,17 +13136,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 "" @@ -12993,15 +13190,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -13012,14 +13209,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Μη έγκυρη ημερομηνία" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13027,58 +13223,58 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../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 "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../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 "WMS" -#: ../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 "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Προτιμήσεις πρόσθετου WMS" -#: ../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 "" @@ -13086,39 +13282,51 @@ "πρόσθετου WMS" -#: ../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 "WMS URL" -#: ../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 "WMS URL (Προκαθορισμένο)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL" -#: ../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 +msgid "Overlap tiles" +msgstr "Επικάλυψη πλακιδίων" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 #, fuzzy -msgid "Copy Selected Default(s)" -msgstr "Αντιγραφή Προξαθορισμένου" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "% of east:" +msgstr "% γεωγ. πλάτους:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "% γεωγ. πλάτους:" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13485,5 +13693,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 "" @@ -14025,7 +14233,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Σαλέ" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14046,8 +14253,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 "Ενοικίαση" +msgstr "" #. color heath @@ -14065,5 +14271,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 "άλσος" @@ -14076,7 +14283,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "εισιτήρια Στάθμευσης" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14112,7 +14318,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "επιλογή" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14123,7 +14328,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "μη ολοκληρωμένη" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14134,7 +14338,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "χόρτο" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14328,4 +14531,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" @@ -14354,12 +14558,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 @@ -14407,5 +14611,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14442,5 +14646,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14504,6 +14708,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 "όχι" @@ -14649,6 +14854,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 "Τύπος" @@ -14919,7 +15124,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Πεζόδρομος" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14938,7 +15142,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Εμπόδια" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15230,7 +15433,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 "Λειτουργός" @@ -15443,6 +15646,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 "Υψόμετρο" @@ -16354,7 +16557,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" @@ -16402,23 +16602,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 "Ώρες Λειτουργείας" @@ -16442,5 +16642,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" @@ -16487,22 +16686,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 "" @@ -16517,22 +16716,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 "" @@ -16547,22 +16746,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 "" @@ -16596,5 +16795,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 "Αριθμός Αναφοράς" @@ -16614,7 +16813,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Σημείωση ως τελειωμένου" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16628,7 +16826,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Χωρητικότητα" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16638,12 +16835,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Θέσεις αναπήρων" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Θέσεις αναπήρων" +msgstr "" #: build/trans_presets.java:1400 @@ -16845,5 +17040,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Καταφύγιο" @@ -17228,7 +17423,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17271,28 +17465,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "κινέζικη" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Λήψη Περιοχής" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Επικόλληση" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Πόλη" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "τοπική" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17320,7 +17509,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Ορειβασία" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17334,7 +17522,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "κτίριο" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17351,13 +17538,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Συνοριακός Σταθμός" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "αρχαρίων" +msgstr "" #: build/trans_presets.java:1737 @@ -17374,7 +17559,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "χρήση γής" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17385,19 +17569,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Πληροφορίες" +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 "Περιγραφή συμβόλου" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Ήχος" +msgstr "" #. @@ -17408,7 +17589,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Αριθμός Τηλεφώνου" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17732,5 +17912,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17764,5 +17944,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18888,6 +19068,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 "Θρησκεία" @@ -18896,66 +19076,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 "βουδισμός" -#: 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 "χριστιανισμός" -#: 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 "ινδουϊσμός" -#: 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 "ιουδαϊσμός" -#: 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 "μουσουλμανισμός" -#: 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 "" -#: 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 "" -#: 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 "ταοϊσμός" -#: 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 "" -#: 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 "Δόγμα" @@ -18964,76 +19144,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 "αγγλικανικό" -#: 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 "βαπτιστικό" -#: 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 "καθολικό" -#: 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 "ευαγγελικό" -#: 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 "μαρτύρων του Ιεχοβά" -#: 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 "λουθερανικό" -#: 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 "" -#: 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 "" -#: 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 "ορθόδοξο" -#: 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 "πεντηκωστής" -#: 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 "" -#: 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 "προτεσταντικό" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19365,5 +19545,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 "Σημείωση" @@ -19388,5 +19568,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 "Κέρματα" @@ -19394,5 +19574,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 "Χαρτονομίσματα" @@ -19400,5 +19580,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 "" @@ -19406,5 +19586,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 "Χρεωστικές Κάρτεσ" @@ -19412,5 +19592,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 "Πιστωτικές Κάρτες" @@ -19469,10 +19649,144 @@ msgstr "Παγκάκι" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Πίσω" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Ηρώο" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "καμοία" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Βασικό" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Χρώμα" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Πίσω" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "κάτω" + +#. 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 "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "τέλος" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Τιμή" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "νερό" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Ποσότητα Αγωγών" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19481,30 +19795,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 "Ύψος" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "χαμηλό" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "μισό" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "πλήρες" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Κρυψώνα" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Κλειδαριά" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Συντριβάνι" @@ -19513,10 +19827,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Επεξεργασία Συντριβανίου" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Πόσιμο Νερό" @@ -19525,10 +19839,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Επεξεργασία πόσιμου νερού" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Βρεφοδόχος" @@ -19536,35 +19850,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 "Καταστήματα" #. 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 "Επεξεργασία Supermarket" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Σαλέ" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Επεξεργασία Σαλέ" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19572,9 +19884,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Περίπτερο" @@ -19582,29 +19894,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Επεξεργασία Περιπτέρου" -#: 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 "Επεξεργασία Στάσης Λεωφορείου" - -#: 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 "Επεξεργασία δένδρου" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Μηχάνημα Πώλησης" @@ -19612,5 +19922,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Επεξεργασία Μηχανήματος Πώλησης" @@ -19618,88 +19928,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 "εισητήρια Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "χάρτες Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "εισιτήρια Στάθμευσης" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "φαγητό" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "ποτά" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "γλυκά" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "τσιγάρα" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "φωτογραφίες" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "τροφές ζώων" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "εφημερίδες" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "Παιχνίδια" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "Γραμματόσημα" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "Κάρτες SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "Προφυλακτικά" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampons" -#: 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 "Κρεοπωλείο" @@ -19707,9 +20017,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Επεξεργασία Κρεοπωλείου" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Φούρνος" @@ -19717,9 +20027,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Επεξεργασία Φούρνου" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Ανθοπωλείο" @@ -19727,18 +20037,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Επεξεργασία Ανθοπωλείου" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Βιολογικά" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Επεξεργασία Καταστήματος Βιολογικών" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19746,54 +20056,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "Υπολογιστές" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Επεξεργασία Καταστήματος Υπολογιστών" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Ηλεκτρονικά" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών" -#: 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 "Έπιπλα" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Επεξεργασία Καταστήματος Επίπλων" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Είδη Κήπου" @@ -19801,9 +20111,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Σιδηρικά" @@ -19811,9 +20121,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Επεξεργασία Καταστήματος Σιδηρικών" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19821,54 +20131,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 "Χαρτικά" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Επεξεργασία Χαρτοπωλείου" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Κομμωτήριο" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Επεξεργασία Κομμωτηρίου" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Υποδήματα" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Επεξεργασία Υποδηματοπωλείου" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Παιχνίδια" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Επεξεργασία Καταστήματος Παιχνιδιών" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Στπγνοκαθαριστήριο" @@ -19876,9 +20186,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Επεξεργασία Στεγνοκαθαριστηρίου" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Πλυντήριο" @@ -19886,9 +20196,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Επεξεργασία πλυντηρίου" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19896,32 +20206,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Αθλητικά" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Επεξεργασία Καταστήματος Αθλητικών" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Μετρητά" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Τράπεζα" @@ -19929,14 +20239,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Επεξεργασία Τράπεζας" -#: 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 "ΑΤΜ" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Συναλλακτήριο" @@ -19944,5 +20254,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Επεξεργασία Συναλλακτηρίου" @@ -19950,15 +20260,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Επεξεργασία ΑΤΜ" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Υγεία" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Ιατροί" @@ -19966,18 +20276,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Επεξεργασία Ιατρών" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Οδοντίατρος" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Επεξεργασία Οδοντιάτρου" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Φαρμακείο" @@ -19985,5 +20295,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Επεξεργασία Φαρμακείου" @@ -19991,9 +20301,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Νοσοκομείο" @@ -20001,10 +20311,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Επεξεργασία Νοσοκομειου" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20013,5 +20323,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20020,20 +20330,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Αριθμός Σημείου" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Όνομα Σημείου" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Αριθμός Τηλεφώνου" #. 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 "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)" @@ -20041,5 +20351,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 "Κτηνιατρίο" @@ -20048,55 +20358,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Επεξεργασία Κτηνιατρίου" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Ήπειρος" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Επεξεργασία Ηπείρου" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Χώρα" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Επεξεργασία Χώρας" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Πολιτεία" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Επεξεργασία Πολιτείας" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Περιοχή" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Επεξεργασία Περιοχής" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Περιφέρεια" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Επεξεργασία Περιφέρειας" @@ -20104,15 +20414,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Πόλη" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Επεξεργασία Πόλης" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Κωμόπολη" @@ -20120,10 +20430,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Επεξεργασία Κωμόπολης" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Προάστιο" @@ -20131,25 +20441,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Επεξεργασία Προαστίου" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Χωριό" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Επεξεργασία Χωριού" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -20157,5 +20467,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20163,10 +20473,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Νησί" @@ -20174,24 +20484,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Επεξεργασία Νησιού" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "αριστερά" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Επεξεργασία Σαλέ" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Είσοδος σπηλαίου" @@ -20199,10 +20507,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Επεξεργασία εισόδου σπηλαίου" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Κορυφή" @@ -20210,10 +20518,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Επεξεργασία κορυφής" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Παγετώνας" @@ -20221,10 +20529,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Επεξεργασία παγετώνα" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Ηφαίστειο" @@ -20232,70 +20540,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Επεξεργασία ηφαιστείου" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Όρια" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Εθνικό" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Επεξεργασία Εθνικού Συνόρου" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Διοικητικό" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Επεξεργασία Διοικητικού Ορίου" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Πολιτικό" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Πολιτικό" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Εθνικό πάρκο" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Χρήση γής" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Δένδρο" @@ -20304,15 +20612,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Επεξεργασία δένδρου" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Βοτανικό όνομα" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Άλσος" @@ -20321,5 +20629,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Επεξεργασία άλσους" @@ -20327,17 +20635,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 "Κωνοφόρο" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "φυλλοβόλα" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "Μικτό" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Δάσος" @@ -20346,14 +20654,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Επεξεργασία Δάσους" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20361,25 +20669,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20387,10 +20695,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20398,5 +20706,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20404,5 +20712,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20411,45 +20719,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Χωράφι" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Επεξεργασία Χωραφιού" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Αμπελώνας" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Επεξεργασία Αμπελώνα" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Κλήροι" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20457,25 +20765,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Κήπος" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Επεξεργασία Κήπου" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Γρασίδι" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20483,10 +20791,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20494,20 +20802,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Πάρκο" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Επεξεργασία Πάρκου" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Χώρος αναψυχής" @@ -20515,5 +20823,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Επεξεργασία χώρου αναψυχής" @@ -20521,15 +20829,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Οικιστική περιοχή" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Επεξεργασία οικιστικής περιοχής" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Νεκροταφείο" @@ -20537,9 +20845,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Επεξεργασία Νεκροταφείου" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Κοιμητήριο" @@ -20547,39 +20855,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Επεξεργασία χρήσης γης κοιμητηρίου" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Βιομηχανική" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20587,15 +20895,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Στρατιωτικά" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20603,55 +20911,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Εγοτάξιο" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Επεξεργασία εργοταξίου" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "ΧΥΤΑ" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Λατομείο" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Επεξεργασία Λατομείου" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20661,5 +20969,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 "" @@ -20668,10 +20976,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20679,5 +20987,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Περιορισμός στροφής" @@ -20686,5 +20994,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Επεξεργασία περιορισμού στροφής" @@ -20692,34 +21000,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Περιορισμός" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "όχι_αριστερή_στροφή" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "όχι_δεξιά_στροφή" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "όχι_ευθεία" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "όχι_αναστροφή" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "μόνο_δεξιά_στροφή" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "μόνο_αριστερή_στροφή" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "μόνο_ευθεία" @@ -20728,15 +21036,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20744,5 +21052,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Διαδρομή" @@ -20751,5 +21059,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Επεξεργασία Διαδρομής" @@ -20757,5 +21065,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Τύπος Διαδρομής" @@ -20763,5 +21071,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20827,5 +21135,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 @@ -20834,17 +21142,17 @@ msgstr "ποδήλατο" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "λεωφορείο" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "δρόμος" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "σκι" @@ -20897,5 +21205,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 @@ -20904,13 +21212,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "πεζοπορία" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "τραμ" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "παράκαμψη" @@ -20924,10 +21232,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "υπόγειος" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Περιγραφή συμβόλου" @@ -20935,31 +21243,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Δίκτυο" #. 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 "προτεινόμενο" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "εναλλακτικό" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "προσωρινό" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "σύνδεση" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Χρώμα (δεκαεξαδικό)" @@ -20968,30 +21276,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "τμήμα διαδρομής" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24144,76 +24452,4 @@ msgstr "ιστορικό" -#. 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 "" - #. color green #. @@ -25181,65 +25417,42 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Όλοι οι δρόμοι ήταν άδειοι" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Συγχώνευση κόμβων με διαφορετικές συμμετοχές;" + +#~ msgid "Merge Anyway" +#~ msgstr "Επιβεβαίωση συγχώνευσης" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον " -#~ "διακομιστή." - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. " -#~ "Παρακαλώ αναφέρετε το σαν σφάλμα." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Διαγραφή {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}" - -#~ msgid "nodes" -#~ msgstr "κόμβοι" - -#~ msgid "relations" -#~ msgstr "σχέσεις" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:
{0}" -#~ "" - -#~ msgid "Delete Layer" -#~ msgstr "Διαγραφή Επιπέδου" - -#~ msgid "Authors: {0}" -#~ msgstr "Συγγραφείς: {0}" - -#~ msgid "Public" -#~ msgstr "Δημόσιο" - -#~ msgid "Continue anyway" -#~ msgstr "Συνέχεια έτσι κι αλλιώς" - -#~ msgid "Edit Information Office" -#~ msgstr "Επεξεργασία Γραφείου Πληροφοριών" - -#~ msgid "Map Type" -#~ msgstr "Τύπος Χάρτη" - -#~ msgid "map" -#~ msgstr "χάρτης" - -#~ msgid "citymap" -#~ msgstr "χάρτης πόλης" - -#~ msgid "hikingmap" -#~ msgstr "χάρτης πεζοπορίας" - -#~ msgid "bicyclemap" -#~ msgstr "χάρτης ποδηλατοδρομίας" +#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να " +#~ "τους συγχωνεύσετε;" + +#~ msgid "Unknown version" +#~ msgstr "Άγνωστη έκδοση" + +#~ msgid " has zero ref" +#~ msgstr " έχει μηδενική αναφορά" + +#~ msgid "Found element in non-relation." +#~ msgstr "Βρέθηκε στοιχείο εκτός σχέσης." + +#~ msgid "Ill-formed node id" +#~ msgstr "Κακοσχηματισμένο id κόμβου" #~ msgid "" @@ -25281,4 +25494,7 @@ #~ msgid "unnamed" #~ msgstr "χωρίς όνομα" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση." #~ msgid "Unknown file extension." @@ -25315,4 +25531,11 @@ #~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα." +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. " +#~ "Παρακαλώ αναφέρετε το σαν σφάλμα." + #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία" @@ -25338,8 +25561,4 @@ #~ msgid "Add Selected" #~ msgstr "Προσθήκη επιλεγμένων" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "" -#~ "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" #~ msgid "Cannot connect to server." @@ -25373,4 +25592,7 @@ #~ msgid "Navigation" #~ msgstr "Πλοήγηση" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Διαγραφή {1} {0}" #~ msgid "" @@ -25415,4 +25637,7 @@ #~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." +#~ msgid "Authors: {0}" +#~ msgstr "Συγγραφείς: {0}" + #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";" @@ -25435,4 +25660,16 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "hikingmap" +#~ msgstr "χάρτης πεζοπορίας" + +#~ msgid "citymap" +#~ msgstr "χάρτης πόλης" + +#~ msgid "map" +#~ msgstr "χάρτης" + +#~ msgid "bicyclemap" +#~ msgstr "χάρτης ποδηλατοδρομίας" #~ msgid "Charge" @@ -25462,4 +25699,7 @@ #~ "συνεχίσετε;" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}" + #~ msgid "resolved version:" #~ msgstr "επιλυμένη έκδοση:" @@ -25479,7 +25719,4 @@ #~ msgstr "Μετακίνηση Κάτω" -#~ msgid "Basic" -#~ msgstr "Βασικό" - #~ msgid "Remove Selected" #~ msgstr "Αφαίρεση Επιλεγμένων" @@ -25488,4 +25725,7 @@ #~ msgstr "Μετακίνηση Πάνω" +#~ msgid "Delete Layer" +#~ msgstr "Διαγραφή Επιπέδου" + #~ msgid "Relation Editor: {0}" #~ msgstr "Επεξεργαστής Σχέσεων: {0}" @@ -25493,4 +25733,7 @@ #~ msgid "Delete and Download" #~ msgstr "Διαγραφή και Λήψη" + +#~ msgid "Public" +#~ msgstr "Δημόσιο" #~ msgid "Change the projection to {0} first." @@ -25507,6 +25750,9 @@ #~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS" -#~ msgid "end" -#~ msgstr "τέλος" +#~ msgid "Map Type" +#~ msgstr "Τύπος Χάρτη" + +#~ msgid "Edit Information Office" +#~ msgstr "Επεξεργασία Γραφείου Πληροφοριών" #~ msgid "Helppage missing. Create it in english." @@ -25529,4 +25775,9 @@ #~ "επίπεδο δεδομένων;" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον " +#~ "διακομιστή." + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα." @@ -25538,16 +25789,24 @@ #~ msgstr "Αποτυχία ενημέρωσης" +#~ msgid "nodes" +#~ msgstr "κόμβοι" + +#~ msgid "relations" +#~ msgstr "σχέσεις" + #~ msgid "Apply partial resolutions" #~ msgstr "Εφαρμογή μερικών επιλύσεων" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:
{0}" +#~ "" + #~ msgid "Error when communicating with server." #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." -#~ msgid "% of lat:" -#~ msgstr "% γεωγ. πλάτους:" +#~ msgid "Continue anyway" +#~ msgstr "Συνέχεια έτσι κι αλλιώς" #~ msgid "% of lon:" #~ msgstr "% γεωγ. μήκους:" - -#~ msgid "Overlap tiles" -#~ msgstr "Επικάλυψη πλακιδίων" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 17594) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 17595) @@ -10,7 +10,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-03 11:00+0000\n" -"Last-Translator: vsandre \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-10 08:18+0000\n" +"Last-Translator: pl71 \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -18,8 +18,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" @@ -27,5 +27,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 @@ -34,18 +34,20 @@ msgstr "Help" -#: ../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 "The projection {0} could not be activated. Using Mercator" -#: ../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 @@ -61,8 +63,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 @@ -76,6 +78,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 @@ -85,5 +87,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 @@ -103,54 +105,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 "Error" -#: ../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] "There are unsaved changes. Discard the changes and continue?" -msgstr[1] "There are unsaved changes. Discard the changes and continue?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Unsaved Changes" -#: ../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 "Save and Exit" -#: ../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 "Discard and Exit" -#: ../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 @@ -159,11 +158,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 @@ -177,20 +177,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 "Cancel" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{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 @@ -207,16 +207,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 @@ -246,15 +246,17 @@ msgstr "Warning" -#: ../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 "Ignoring malformed file URL: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -341,5 +343,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 "Plugins" @@ -354,20 +356,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -478,9 +476,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 @@ -514,6 +512,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 @@ -532,11 +530,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 "Information" @@ -558,5 +556,5 @@ msgstr "Please select at least three nodes." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -567,10 +565,10 @@ "{0}, max is {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 Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -581,5 +579,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -590,9 +588,9 @@ "length {2}. Values length is {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Precondition Violation" -#: ../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}" @@ -647,77 +645,61 @@ msgstr "No conflicts to zoom to" -#: ../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 "Combine Way" -#: ../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 "Combine several ways into one." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Combine ways with different memberships?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Combine Anyway" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Change directions?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Reverse and Combine" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" + +#: ../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 "" +"Could not combine ways (They could not be merged into a single string of " +"nodes)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Combine {0} ways" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Combine ways with different memberships?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Combine Anyway" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Change directions?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Reverse and Combine" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" - -#: ../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 "Enter values for all conflicts." - -#: ../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 "Solve Conflicts" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Combine {0} ways" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "All the ways were empty" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -773,5 +755,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 "Delete" @@ -781,15 +763,15 @@ msgstr "Delete selected objects." -#: ../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 "Overwrite" -#: ../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 "File exists. Overwrite?" @@ -818,10 +800,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}" @@ -852,5 +834,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 @@ -893,7 +875,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "All images" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1030,1070 +1011,25 @@ msgstr "Merge the current layer into another layer" -#: ../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 "Merge Nodes" -#: ../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 "Merge nodes into the oldest one." -#: ../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 "Please select at least two nodes to merge." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Merge nodes with different memberships?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Merge Anyway" - -#: ../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 "" -"The selected nodes have differing relation memberships. Do you still want " -"to merge them?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Cannot merge nodes: Would have to delete a way that is still used." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Merge {0} nodes" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Merge selection" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Merge the currently selected primitives into another layer" - -#: ../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 "Mirror" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Mirror selected nodes and ways." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Please select at least one node or way." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "up" - -#: ../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 "Move objects {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "down" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "left" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "right" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Move {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Moves Objects {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 "Cannot move objects outside of the world." - -#: ../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 "New" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Create a new map." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Open..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Open a file." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Open a file." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Unknown role ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Open Location..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Open an URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separate Layer" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Enter URL to download:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Download Location" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Download URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Orthogonalise Shape" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Move nodes so all angles are 90 or 270 degree" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Only two nodes allowed" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Selection must consist only of ways." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Please select one or more closed ways of at least four nodes." - -#: ../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 "" -"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?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Only one node selected" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Orthogonalise" - -#: ../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 "Paste" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Paste contents of paste buffer." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Paste Tags" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Apply tags of contents of paste buffer to all selected items." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Loading {0}" -msgstr[1] "Loading {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Undelete {0} primitives" -msgstr[1] "Undelete {0} primitives" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferences..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Open a preferences page for global settings." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferences" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Redo" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Redo the last undone action." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Rename layer" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Also rename the file" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Could not rename file ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Reverse Ways" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Reverse the direction of all selected ways." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Please select at least one way." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Reverse ways" - -#: ../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 "Save" - -#: ../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 "Save the current data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "File {0} exists. Overwrite?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "No Exporter found! Nothing saved." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Empty document" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "The document contains no data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Save anyway" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflicts" - -#: ../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 "" -"There are unresolved conflicts. Conflicts will not be saved and handled as " -"if you rejected all. Continue?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Reject Conflicts and Save" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Save OSM file" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Save GPX file" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Save Layer" - -#: ../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 "Save As..." - -#: ../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 "Save the current data to a new file." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Select All" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Show Status Report" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Show status report with useful information that can be attached to bugs" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Help: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Status Report" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copy to clipboard and close" - -#: ../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 "Close" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Split Way" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Split a way at the selected node." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "The current selection cannot be used for splitting." - -#: ../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] "The selected node is not in the middle of any way." -msgstr[1] "The selected nodes are not in the middle of any way." - -#: ../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] "" -"There is more than one way using the node you selected. Please select the " -"way also." -msgstr[1] "" -"There is more than one way using the nodes you selected. Please select the " -"way also." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "The selected nodes do not share the same way." - -#: ../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] "The selected way does not contain the selected node." -msgstr[1] "The selected way does not contain all the selected nodes." - -#: ../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 "You must select two or more nodes to split a circular way." - -#: ../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 "" -"A role based relation membership was copied to all new ways.
You " -"should verify this and correct it when necessary." - -#: ../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 "" -"A relation membership was copied to all new ways.
You should verify " -"this and correct it when necessary." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 -#, java-format -msgid "Split way {0} into {1} parts" -msgstr "Split way {0} into {1} parts" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Closing changeset..." - -#: ../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 "Closing changeset..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "There are currently no WMS layer to adjust." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Opening changeset..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Closing changeset..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Toggle GPX Lines" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Draw lines between raw gps points." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Toggles the global setting ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "UnGlue Ways" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplicate nodes that are used by multiple ways." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "This node is not glued to anything else." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "None of these nodes are glued to anything else." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "None of this way's nodes are glued to anything else." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "The current selection cannot be used for unglueing." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Select either:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* One tagged node, or" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* One node that is used by more than one way, or" - -#: ../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 "* One node that is used by more than one way and one of those ways, or" - -#: ../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 "" -"* One way that has one or more nodes that are used by more than one way, or" - -#: ../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 "" -"* One way and one or more of its nodes that are used by more than one way." - -#: ../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 "" -"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." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Unglued Node" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Dupe into {0} nodes" - -#. 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 "Dupe {0} nodes into {1} nodes" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Undo" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Undo the last action." - -#: ../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 "Unselect All" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Unselect all objects." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Unselect All (Focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Unselect All (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Update Data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Updates the current data layer from the server (re-downloads data)" - -#. 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 "Updating data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "No current dataset found" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "Didn't find a primitive with id {0} in the current dataset" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Update Selection" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Updates the currently selected primitives from the server" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "There are no selected primitives to update." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Selection empty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Upload to OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Upload all changes to the OSM server." - -#: ../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 "There are unresolved conflicts. You have to resolve these first." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nothing to upload. Get some data first." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "No changes to upload." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synchronize {0} {1} only" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Synchronize entire dataset" - -#: ../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 "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.
The conflict is " -"caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Conflict detected" - -#. 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 "unexpected return value. Got {0}" - -#: ../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 "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Uploading failed.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Upload to OSM API failed" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Updating primitive" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Upload these changes?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Upload Changes" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Edit new relation in layer ''{0}''" - -#: ../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 "Add a new node to an existing way" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "upload all changes in one request" - -#: ../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 "" -"Enable to upload all changes in one request, disable to use one request per " -"changed primitive" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Provide a brief comment for the changes you are uploading:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Map Settings" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "changeset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objects to add:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objects to modify:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objects to delete:" - -#: ../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] "Objects to add:" -msgstr[1] "Objects to add:" - -#: ../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] "Objects to modify:" -msgstr[1] "Objects to modify:" - -#: ../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] "Objects to delete:" -msgstr[1] "Objects to delete:" - -#: ../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 "Last change at {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Zoom In" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zoom Out" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Back" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Jump back." - -#: ../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 "Faster" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Faster Forwards" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Forwards" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Jump forwards" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Next Marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Play next marker." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Play/Pause" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Play/pause audio." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Previous Marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Play previous marker." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Slower" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Slower Forwards" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Downloading GPS data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Downloaded GPX Data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Raw GPS data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Downloading data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" -"Ignoring exception because download has been cancelled. Exception was: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "No data imported." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Download {0} of {1} ({2} left)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "The following errors occurred during mass download:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Errors during Download" - -#: ../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 "" -"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.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Deleted or moved primitives" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Delete Mode" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Delete nodes or ways." - -#: ../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 "Mode: {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 "" -"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " -"when deleting a way. Ctrl: delete referring objects." - +#: ../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 @@ -2104,7 +1040,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 @@ -2113,6 +1050,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 @@ -2143,4 +1080,912 @@ msgstr "parameter ''{0}'' must not be 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 "Cannot merge nodes: Would have to delete a way that is still used." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Merge {0} nodes" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Merge selection" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Merge the currently selected primitives into another layer" + +#: ../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 "Mirror" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Mirror selected nodes and ways." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Please select at least one node or way." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "up" + +#: ../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 "Move objects {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "down" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "left" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "right" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Move {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Moves Objects {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 "Cannot move objects outside of the world." + +#: ../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 "New" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Create a new map." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Open..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Open a file." + +#: ../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 "Open Location..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Open an URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separate Layer" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Enter URL to download:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Download Location" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Download URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Orthogonalise Shape" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Move nodes so all angles are 90 or 270 degree" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Only two nodes allowed" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Selection must consist only of ways." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Please select one or more closed ways of at least four nodes." + +#: ../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 "" +"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?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Only one node selected" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Orthogonalise" + +#: ../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 "Paste" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Paste contents of paste buffer." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Paste Tags" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Apply tags of contents of paste buffer to all selected items." + +#: ../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 "Preferences..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Open a preferences page for global settings." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferences" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Redo" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Redo the last undone action." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Rename layer" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Also rename the file" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Could not rename file ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Reverse Ways" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Reverse the direction of all selected ways." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Please select at least one way." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Reverse ways" + +#: ../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 "Save" + +#: ../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 "Save the current data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "File {0} exists. Overwrite?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "No Exporter found! Nothing saved." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Empty document" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Save anyway" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "The document contains no data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflicts" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Reject Conflicts and Save" + +#: ../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 "" +"There are unresolved conflicts. Conflicts will not be saved and handled as " +"if you rejected all. Continue?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Save OSM file" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Save GPX file" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Save Layer" + +#: ../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 "Save As..." + +#: ../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 "Save the current data to a new file." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Select All" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Show Status Report" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Show status report with useful information that can be attached to bugs" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Help: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Status Report" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copy to clipboard and close" + +#: ../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 "Close" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Split Way" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Split a way at the selected node." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "The current selection cannot be used for splitting." + +#: ../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] "The selected node is not in the middle of any way." +msgstr[1] "The selected nodes are not in the middle of any way." + +#: ../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] "" +"There is more than one way using the node you selected. Please select the " +"way also." +msgstr[1] "" +"There is more than one way using the nodes you selected. Please select the " +"way also." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "The selected nodes do not share the same way." + +#: ../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] "The selected way does not contain the selected node." +msgstr[1] "The selected way does not contain all the selected nodes." + +#: ../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 "You must select two or more nodes to split a circular way." + +#: ../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 "" +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." + +#: ../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 "" +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Split way {0} into {1} parts" + +#: ../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 "Toggle GPX Lines" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Draw lines between raw gps points." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Toggles the global setting ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "UnGlue Ways" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplicate nodes that are used by multiple ways." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "This node is not glued to anything else." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "None of these nodes are glued to anything else." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "None of this way's nodes are glued to anything else." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "The current selection cannot be used for unglueing." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Select either:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* One tagged node, or" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* One node that is used by more than one way, or" + +#: ../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 "* One node that is used by more than one way and one of those ways, or" + +#: ../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 "" +"* One way that has one or more nodes that are used by more than one way, or" + +#: ../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 "" +"* One way and one or more of its nodes that are used by more than one way." + +#: ../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 "" +"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." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Unglued Node" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Dupe into {0} nodes" + +#. 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 "Dupe {0} nodes into {1} nodes" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Undo" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Undo the last action." + +#: ../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 "Unselect All" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Unselect all objects." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Unselect All (Focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Unselect All (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Update Data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Updates the current data layer from the server (re-downloads data)" + +#. 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 "Updating data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "No current dataset found" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Didn't find a primitive with id {0} in the current dataset" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Update Selection" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Updates the currently selected primitives from the server" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "There are no selected primitives to update." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Selection empty" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Upload to OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Upload all changes to the OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"There are no layers the source layer
''{0}''
could be merged to." +"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Nothing to upload. Get some data first." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "No changes to upload." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synchronize {0} {1} only" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Synchronize entire dataset" + +#: ../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 "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Conflict detected" + +#. 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 "unexpected return value. Got {0}" + +#: ../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 "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Uploading failed.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Upload to OSM API failed" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Updating primitive" + +#: ../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 "Zoom In" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zoom Out" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Back" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Jump back." + +#: ../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 "Faster" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Faster Forwards" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Forwards" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Jump forwards" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Next Marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Play next marker." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Play/Pause" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Play/pause audio." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Previous Marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Play previous marker." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Slower" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Slower Forwards" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Downloading GPS data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Downloaded GPX Data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Raw GPS data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Downloading data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Ignoring exception because download has been cancelled. Exception was: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "No data imported." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Download {0} of {1} ({2} left)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "The following errors occurred during mass download:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Errors during Download" + +#: ../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 "" +"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.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Deleted or moved primitives" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Delete Mode" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Delete nodes or ways." + +#: ../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 "Mode: {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 "" +"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " +"when deleting a way. Ctrl: delete referring objects." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2255,18 +2100,18 @@ "+release to synchronise audio at that point." -#: ../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 "Select" -#: ../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 "Select, move and rotate objects" -#: ../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" @@ -2275,18 +2120,18 @@ msgstr[1] "Add and move a virtual new node to {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Move elements" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Move them" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Undo move" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2294,9 +2139,6 @@ "Really move them?" msgstr "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" - -#: ../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 "" @@ -2419,7 +2261,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - object with given ID (id:0 for all new objects)" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2472,41 +2313,41 @@ msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Start Search" -#: ../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 "No match found for ''{0}''" -#: ../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 "Nothing added to selection by searching for ''{0}''" -#: ../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 "Nothing removed from selection by searching for ''{0}''" -#: ../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 "Found {0} matches" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2519,40 +2360,40 @@ "{2}" -#: ../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 "Key cannot be empty when tag operator is used. Sample use: key=value" -#: ../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 "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -#: ../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 "Unknown primitive type: {0}. Allowed values are node, way or relation" -#: ../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 "Unexpected token: {0}" -#: ../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 "Missing arguments for or." -#: ../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 "Missing argument for not." -#: ../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 "Expected closing bracket." -#: ../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 "Wrong number of parameters for nodes operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2563,5 +2404,5 @@ "nodes or range, for example nodes:10-20" -#: ../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." @@ -2598,62 +2439,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Add node" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Add {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relations: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Change relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2728,30 +2569,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] "Delete {0} {1}" -msgstr[1] "Delete {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] "Delete Mode" -msgstr[1] "Delete Mode" +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] "Delete {0} {1}" -msgstr[1] "Delete {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] "Delete from relation" -msgstr[1] "Delete from relation" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2765,20 +2606,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2789,5 +2626,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." @@ -2870,17 +2707,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Resolve {0} tag conflicts in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Resolve {0} tag conflicts in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Resolve {0} tag conflicts in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2890,17 +2727,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Resolve version conflicts for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Resolve version conflicts for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Resolve version conflicts for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2990,9 +2827,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." -msgstr "failed to set reference. reference id {0} doesn't match history id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3038,9 +2875,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Preferences file had errors. Making backup of old one to {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3109,5 +2946,5 @@ msgstr "E" -#: ../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 @@ -3115,22 +2952,47 @@ msgstr "Changeset {0}" -#: ../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 "parameter {0} > 0 required. Got {1}." -#: ../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 "parameter ''{0}'' must not be null" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "No useful role ''{0}'' for Way ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../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 "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "unexpected column index. Got {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "child.id >0 expected. Got {1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "child.id >0 expected. Got {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3144,11 +3006,16 @@ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''" -#: ../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 "" @@ -3199,9 +3066,9 @@ msgstr "parameter {0} not in range 0..{1}, got {2}" -#: ../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 "Area style way is not closed." -#: ../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." @@ -3210,118 +3077,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 "Empty member in relation." -#: ../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 "Deleted member ''{0}'' in relation." -#: ../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 "Way ''{0}'' with less than two points." -#: ../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 "More than one \"from\" way found." -#: ../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 "More than one \"to\" way found." -#: ../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 "More than one \"via\" found." -#: ../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 "Unknown role ''{0}''." -#: ../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 "Unknown member type for ''{0}''." -#: ../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 "No \"from\" way found." -#: ../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 "No \"to\" way found." -#: ../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 "No \"via\" node or way found." -#: ../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 "The \"from\" way doesn't start or end at a \"via\" node." -#: ../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 "The \"to\" way doesn't start or end at a \"via\" node." -#: ../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 "The \"from\" way doesn't start or end at the \"via\" way." -#: ../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 "The \"to\" way doesn't start or end at the \"via\" way." -#: ../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 "Style for restriction {0} not found." -#: ../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 "No useful role ''{0}'' for Way ''{1}''." -#: ../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 "Non-Way ''{0}'' in multipolygon." -#: ../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 "No outer way for multipolygon ''{0}''." -#: ../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 "Intersection between ways ''{0}'' and ''{1}''." -#: ../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 "Inner way ''{0}'' is outside." -#: ../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 "Style for inner way ''{0}'' equals multipolygon." -#: ../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 "Style for outer way ''{0}'' mismatches." -#: ../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 "untagged" -#: ../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 "text" @@ -3347,5 +3214,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" @@ -3356,5 +3223,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" @@ -3365,5 +3232,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" @@ -3446,7 +3313,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Could not read bookmarks.
{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3477,5 +3344,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "railway" @@ -3507,143 +3374,34 @@ msgstr[1] "{0} members" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." - -#. 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 "unknown" - -#: ../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 "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Precondition violation" -#: ../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 "" -"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}''." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Security exception" -#: ../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 "" -"Failed to open a connection to the remote server
''{0}''.
Please " -"check your internet connection." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Network exception" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 "" -"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." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Edit Racquet" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Unknown 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 "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitive already deleted" @@ -3862,5 +3620,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}" @@ -4252,4 +4010,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 @@ -4324,8 +4084,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 @@ -4459,5 +4219,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 "deleted" @@ -4517,10 +4277,10 @@ #: ../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 "No, abort" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4528,7 +4288,4 @@ "yo agree?" msgstr "" -"To keep your local version, JOSM
has to reset the id of {0} {1} to " -"0.
On the next upload the server will assign
it a new id.
Do yo " -"agree?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4562,4 +4319,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 @@ -4573,5 +4331,5 @@ msgstr "Primitive" -#: ../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 "merged nodes not frozen yet. Can't build resolution command" @@ -4677,4 +4435,40 @@ msgstr "Their dataset does not include a tag with key {0}" +#: ../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 "No pending tag conflicts to be resolved" + +#: ../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 "Apply" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4687,24 +4481,23 @@ msgstr "all" -#: ../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 "Choose a colour" - -#: ../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 -#, fuzzy, java-format +#: ../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 "parameter ''{0}'' is not a valid type name, got ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4712,12 +4505,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameter ''{0}'' must not be null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4725,15 +4518,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "not deleted" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Not implemented yet." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4742,17 +4535,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "from way" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Delete from relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Conflicts in data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4776,24 +4566,8 @@ msgstr[1] "{0} relations" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Conflict Resolution" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Resolve conflicts" - -#: ../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 "Apply" - #: ../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 "Paste" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4808,9 +4582,75 @@ #: ../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} start" -msgstr[1] "{0} start" +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 "Remove the currently selected members from this relation" + +#: ../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 "place" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Undecide" + +#. --- 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 "Role:" + +#: ../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 "Key:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Value" + +#: ../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 "One Way" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revision" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4837,5 +4677,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}" @@ -4866,5 +4706,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." @@ -4943,13 +4783,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 "Layer: {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 "Relations: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5035,5 +4875,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 "" @@ -5092,5 +4932,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 "Add" @@ -5140,5 +4980,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 "Relations" @@ -5232,32 +5072,27 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, fuzzy, java-format +#, java-format msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "Author" -msgstr[1] "Author" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -#, fuzzy msgid "Select primitives submitted by this user" -msgstr "Select primitives for selected relation members" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Show" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "More information about this feature" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"WARNING: launching browser windows for the first {0} of {1} selected " -"primitives only" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5334,5 +5169,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}" @@ -5351,9 +5186,4 @@ msgid "Child Relations" msgstr "Child Relations" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Role:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5629,11 +5459,11 @@ msgstr "Linked" -#: ../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 "Download referring relations" -#: ../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 +#, fuzzy, java-format +msgid "child.getId() >0 expected. Got {1}" msgstr "child.id >0 expected. Got {1}" @@ -5647,7 +5477,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Load parent relations" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5773,5 +5602,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Places" @@ -5849,8 +5678,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "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 "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -5884,17 +5714,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "History for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "History for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "History for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5903,7 +5733,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Display the history of the selected primitive" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5937,22 +5766,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "child.id >0 expected. Got {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Loading history for {0} with id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Loading history for {0} with id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Loading history for {0} with id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6787,78 +6616,74 @@ #: 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 "Name" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Version {0} created on {1} by " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "More information about this feature" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6876,7 +6701,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Street name" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6917,12 +6741,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Please select a value" +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 "Layer ''{0}'' must be in list of layers" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6967,6 +6790,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Fix tag conflicts" +msgid "Unsaved data and conflicts" +msgstr "Resolve conflicts" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6983,5 +6806,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 "" @@ -7001,5 +6824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 #, fuzzy -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "Use default tag ignore file." @@ -7013,7 +6836,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Discard and Exit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7026,7 +6848,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Save and Exit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7104,7 +6925,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "On upload" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7113,17 +6933,148 @@ #: ../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 "upload all changes in one request" + +#: ../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 "" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Provide a brief comment for the changes you are uploading:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Objects to add:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objects to modify:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objects to delete:" + +#: ../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 "Upload Changes" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "File" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Upload these changes?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Uploading" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Please enter a name for the location." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Cancel the updates and close the dialog" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "There are no selected primitives to update." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7356,5 +7307,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." @@ -7412,7 +7362,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Downloading data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7477,4 +7426,13 @@ msgid "Convert to GPX layer" msgstr "Convert to GPX layer" + +#: ../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 "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7668,5 +7626,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 "Please select the row to delete." @@ -8142,7 +8100,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Show object ID in selection lists" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8157,7 +8114,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Show object ID in selection lists" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8535,8 +8491,4 @@ msgstr "Disable" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Key:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8593,5 +8545,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 @@ -8602,42 +8554,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Add a new layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Delete the selected layer." - -#: ../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 "More information about this feature" #. 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 "Optional Attributes:" -#: ../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 "Use preset ''{0}'' of group ''{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 "Use preset ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "closed way" -#: ../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 "Unknown type: {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 @@ -8648,15 +8598,15 @@ msgstr "Could not read tagging preset source: {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 "Error parsing {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 "Elements of type {0} are supported." -#: ../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 @@ -8666,18 +8616,18 @@ msgstr[1] "Change {0} objects" -#: ../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 "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Change Properties" @@ -8704,5 +8654,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, possibly some missing tags." @@ -8718,7 +8667,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 @@ -8796,5 +8742,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}" @@ -8802,5 +8748,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" @@ -8808,5 +8754,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" @@ -8827,6 +8772,6 @@ msgstr "no primitive with id {0} in local dataset. Can't infer primitive type" -#: ../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 @@ -8836,40 +8781,40 @@ msgstr "Downloading OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#, java-format msgid "Fetching node with id {0} from ''{1}''" -msgstr "Fetching {0} with id {1} from ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#, java-format msgid "Fetching way with id {0} from ''{1}''" -msgstr "Fetching {0} with id {1} from ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Fetching {0} with id {1} from ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Server replied with response code 404 for id {0}. Skipping." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#, java-format msgid "Fetching a package of nodes from ''{0}''" -msgstr "Fetching a package of {0} from ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#, java-format msgid "Fetching a package of ways from ''{0}''" -msgstr "Fetching a package of {0} from ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Fetching a package of {0} from ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8935,10 +8880,10 @@ msgstr "Communications with {0} established using protocol version {1}" -#: ../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 "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8947,11 +8892,9 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Opening changeset..." - -#: ../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}" @@ -8959,34 +8902,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 "Opening changeset..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Opening changeset..." - -#: ../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 "Opening changeset..." - -#: ../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 " @@ -8994,44 +8921,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../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 "Closing changeset..." - -#: ../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 "Opening changeset..." - -#: ../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 "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409 +#, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." -msgstr "Starting retry {0} of {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "OK - trying again." msgstr "OK - trying again." -#: ../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}." @@ -9050,10 +8977,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 "OSM Server Files bzip2 compressed" -#: ../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 "Invalid bz2 file." @@ -9115,6 +9042,11 @@ "URL.
Do not use a valuable Password." +#: ../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 Server Files" @@ -9145,5 +9077,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 "OSM Server Files gzip compressed" @@ -9206,75 +9138,140 @@ msgstr "Error during parse." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Unknown version" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Version number missing from OSM data" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "mandatory attribute ''{0}'' missing" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "mandatory attribute ''{0}'' missing" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Unknown version: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "mandatory attribute ''{0}'' missing" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Found element in non-way." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " has zero ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Found element in non-relation." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "Missing attribute \"ref\" on member in relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Missing attribute \"type\" on member {0} in relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Incomplete specification with 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Illegal object with id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" +msgstr "" "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" -msgstr "" -"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" + +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Unknown version: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Missing attribute \"version\" on OSM primitive with id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Missing required attribute \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" + +#: ../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 "" @@ -9285,16 +9282,30 @@ "missing in the loaded data and is therefore incomplete too" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, fuzzy, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "Unknown relation member type {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440 -#, java-format -msgid "Unknown relation member type {0}" -msgstr "Unknown relation member type {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Prepare OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Ill-formed node id" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Parsing OSM history data ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Preparing data..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9340,35 +9351,43 @@ "Couldn't connect to the osm server. Please check your internet connection." -#: ../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} left. Uploading {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} left. Uploading {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} left. Uploading {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 -#, fuzzy, java-format +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 "Uploading..." + +#: ../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 "" -"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not able to handle them. Ignoring changesets." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 -#, fuzzy -msgid "Starting to upload in one request ..." -msgstr "Nothing to upload. Get some data first." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9406,12 +9425,7 @@ msgstr "Downloading Plugin {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Skip download" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "JOSM version {0} required for plugin {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9423,4 +9437,9 @@ msgstr "Skip Download" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM version {0} required for plugin {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9463,20 +9482,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 "Disable plugin" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Keep plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Could not load plugin {0}. Delete from preferences?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Keep plugin" - -#: ../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 " @@ -9486,5 +9505,9 @@ "overwrite the existing ones." -#: ../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 "" @@ -9493,10 +9516,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../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 "According to the information within the plugin, the author is {0}." -#: ../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." @@ -9504,9 +9527,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../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 "Should the plugin be disabled?" -#: ../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 " @@ -9516,13 +9539,13 @@ "unload the plugin." -#: ../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 "The plugin could not be removed. Probably it was already disabled" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Plugin information" -#: ../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" @@ -9579,4 +9602,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 "unknown" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9650,4 +9704,105 @@ msgstr "(The text has already been copied to your clipboard.)" +#: ../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 "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" + +#: ../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 "" +"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}''." + +#: ../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 "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." + +#: ../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 +#, fuzzy +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 "" +"The maximum bbox size is 0.25, and your request was too large. Either " +"request a smaller area, or use planet.osm." + +#: ../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 "" +"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." + +#: ../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 "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9723,5 +9878,5 @@ "was: {1}" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9730,5 +9885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9737,5 +9892,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9744,5 +9899,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9751,5 +9906,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9810,40 +9965,39 @@ msgstr "Upload Traces" -#: ../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 "Description" -#: ../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 "Please enter Description about your trace." -#: ../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 "Please enter tags about your trace." -#: ../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}" @@ -9851,47 +10005,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 "Connecting..." -#: ../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 "Upload cancelled" -#: ../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 "Error while uploading" -#: ../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 "GPX upload was successful" -#: ../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 "Upload failed. Server returned the following message: " -#: ../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 "Uploading GPX track: {0}% ({1} of {2})" -#: ../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 "No description provided. Please provide some description." -#: ../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 "No GPX layer selected. Cannot upload a trace." -#: ../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 "No username provided." -#: ../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 "No password provided." -#: ../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 "Uploading GPX Track" @@ -10110,5 +10264,5 @@ msgstr "Not yet tagged images" -#: ../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 "Correlate images with GPX track" @@ -10122,13 +10276,13 @@ msgstr "Auto-Guess" -#: ../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 "You should select a GPX track" -#: ../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 "No selected GPX track" -#: ../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 "" @@ -10139,9 +10293,9 @@ "Expected format: {0}" -#: ../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 "Invalid timezone" -#: ../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 "" @@ -10152,26 +10306,26 @@ "Expected format: {0}" -#: ../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 "Invalid offset" -#: ../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 "Found {0} matches of {1} in GPX track {2}" -#: ../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 "GPX Track loaded" -#: ../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 "The selected photos don't contain time information." -#: ../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 "Photos don't contain time information" -#: ../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." @@ -10179,39 +10333,39 @@ "The selected GPX track doesn't contain timestamps. Please select another one." -#: ../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 "GPX Track has no time information" -#: ../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 "Timezone: {0}" -#: ../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 "Minutes: {0}" -#: ../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 "Seconds: {0}" -#: ../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 "Matched {0} of {1} photos to GPX track." -#: ../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 "(Time difference of {0} days)" -#: ../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 "Offset between track and photos: {0}m {1}s" -#: ../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 " @@ -10221,13 +10375,13 @@ "adjust the sliders to manually match the photos." -#: ../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 "Matching photos to track failed" -#: ../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 "Adjust timezone and offset" -#: ../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 "Default Values" @@ -10265,5 +10419,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 "Error loading file" @@ -10292,11 +10446,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10312,13 +10464,13 @@ msgstr "Choose from..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../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" @@ -10330,13 +10482,13 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../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 "JOSM is stopped for the change to take effect." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10457,9 +10609,9 @@ msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Auto-tag source added:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Add \"source=...\" to elements?" @@ -10547,5 +10699,4 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 -#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" @@ -10553,7 +10704,4 @@ "projections and retry" msgstr "" -"To enable the cadastre WMS plugin, change\n" -"the current projection to one of the cadastre\n" -"projection and retry" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 @@ -10573,7 +10721,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "image loading..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10619,7 +10766,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Select" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10707,5 +10853,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 "Blank Layer" @@ -11651,18 +11797,18 @@ msgstr "Unknown issue state" -#: ../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 "Open Visible..." -#: ../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 "Open only files that are visible in current view." -#: ../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 "No view open - cannot determine boundaries!" -#: ../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}" @@ -11673,5 +11819,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11681,9 +11827,9 @@ "the preferences." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender options" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox executable" @@ -11694,28 +11840,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Create new node." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "change the selection" -#: ../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 "change the viewport" -#: ../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 "confirm all Remote Control actions manually" -#: ../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 "A plugin that allows JOSM to be controlled from other applications." -#: ../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 "Remote Control" -#: ../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 "Settings for the Remote Control plugin." -#: ../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 " @@ -11727,28 +11878,35 @@ "talking to the plugin." -#: ../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 "Permitted actions" -#: ../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 "Remote Control has been asked to load data from the API." -#: ../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 "Request details: {0}" -#: ../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 "Do you want to allow this?" -#: ../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 "Confirm Remote Control action" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Remote Control has been asked to load data from the API." + +#: ../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 "Remote Control has been asked to import data from the following URL:" @@ -12248,25 +12406,33 @@ "verify no errors have been introduced." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Enter values for all conflicts." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Solve Conflicts" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Fix tag conflicts" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Removed Element from Relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Join Areas: Remove Short Ways" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Closed Way" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Remove tags from inner ways" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Join Areas Function" @@ -12340,6 +12506,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 "Validation errors" @@ -12349,10 +12515,10 @@ msgstr "No validation errors" -#: ../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 "Grid" -#: ../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 "" @@ -12443,51 +12609,66 @@ msgstr "Performs the data validation" -#: ../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 "Data with errors. Upload anyway?" -#: ../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 "Open the validation window." -#: ../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 "Zoom to problem" -#: ../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 "Fix" -#: ../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 "Fix the selected errors." -#: ../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 "Ignore" -#: ../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 "Ignore the selected errors next time." -#: ../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 "Whole group" -#: ../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 "Single elements" -#: ../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 "Nothing" -#: ../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 "Ignore whole group or individual elements?" -#: ../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 "Ignoring elements" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Waiting 10 seconds ... " + +#: ../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 "Updating data" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12513,16 +12694,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"This test checks if two roads, railways or waterways crosses in the same " -"layer, but are not connected by a node." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Create buildings" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12530,19 +12707,18 @@ msgstr "Crossing ways" -#: ../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 "Duplicated nodes" -#: ../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 "This test checks that there are no nodes at the very same location." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Nodes with same name" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Confirmation" @@ -12550,19 +12726,16 @@ #: ../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 "Duplicate Way" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "This test checks that there are no nodes at the very same location." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Create duplicate way" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13137,5 +13310,5 @@ msgstr "Reached a junction" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Exception occurred" @@ -13241,5 +13414,5 @@ msgstr "Add Rectified Image" -#: ../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 " @@ -13249,5 +13422,5 @@ "again." -#: ../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 "No valid WMS URL or id" @@ -13265,17 +13438,17 @@ msgstr "Please select the WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "Select WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Start adjusting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "There are currently no WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "No layers to adjust" @@ -13318,19 +13491,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Activate" - -#: ../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 "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../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 "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13340,15 +13512,18 @@ "tiles anyway?" msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +"The base URL
''{0}''
for this WMS layer does neither end with a " +"''&'' nor with a ''?''.
This is likely to lead to invalid WMS request. " +"You should check your
preference settings.
Do you want to fetch WMS " +"tiles anyway?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Invalid date" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13356,102 +13531,113 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../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 "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Open a blank WMS layer to load data from a file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "WMS Plugin Preferences" -#: ../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 "Modify list of WMS servers displayed in the WMS plugin menu" -#: ../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 "Menu Name" -#: ../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 "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Menu Name (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS URL (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Enter a menu name and WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Copy defaults" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Please select at least one way." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Downloader:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Overlap tiles" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% of lat:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% of lat:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TCX Files (*.tcx)" +msgstr "" #. * @@ -13857,5 +14043,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 "Reference" @@ -14397,7 +14583,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Chalet" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14418,8 +14603,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 "Rental" +msgstr "" #. color heath @@ -14437,5 +14621,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 "wood" @@ -14448,7 +14633,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parking_tickets" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14484,7 +14668,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "cobblestone" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14495,7 +14678,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incomplete" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14506,7 +14688,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "grass" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14700,4 +14881,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" @@ -14726,12 +14908,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 "yes" #. color permissive -#. +#. #. 1 #. 40000 @@ -14779,5 +14961,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14814,5 +14996,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14876,6 +15058,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 "no" @@ -15021,6 +15204,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 "Type" @@ -15291,7 +15474,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Pedestrian" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15310,7 +15492,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Spikes" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15602,7 +15783,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 "Operator" @@ -15815,6 +15996,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 "Elevation" @@ -16726,7 +16907,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" @@ -16774,23 +16952,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 "Opening Hours" @@ -16814,5 +16992,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" @@ -16859,22 +17036,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 "" @@ -16889,22 +17066,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 "" @@ -16919,22 +17096,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 "" @@ -16968,5 +17145,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 "Reference number" @@ -16986,7 +17163,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "park_and_ride" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -17000,7 +17176,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Capacity" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -17010,12 +17185,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Spaces for Disabled" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Spaces for Disabled" +msgstr "" #: build/trans_presets.java:1400 @@ -17217,5 +17390,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Shelter" @@ -17600,7 +17773,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17643,28 +17815,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chinese" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Download Area" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Paste" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "City" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regional" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17692,7 +17859,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Mountain Hiking" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17706,7 +17872,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "siding" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17723,13 +17888,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Border Control point" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "novice" +msgstr "" #: build/trans_presets.java:1737 @@ -17746,31 +17909,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "landuse" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Guidepost (Hiking)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Information" +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 "Closer Description" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "" #. @@ -17781,7 +17939,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Phone Number" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18105,5 +18262,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18137,5 +18294,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19261,6 +19418,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 "Religion" @@ -19269,66 +19426,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 "bahai" -#: 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 "buddhist" -#: 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 "christian" -#: 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 "jain" -#: 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 "jewish" -#: 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 "muslim" -#: 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 "unitarian" -#: 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 "zoroastrian" -#: 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 "Denomination" @@ -19337,76 +19494,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 "anglican" -#: 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 "catholic" -#: 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 "evangelical" -#: 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 "jehovahs_witness" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" @@ -19738,5 +19895,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 "Note" @@ -19761,5 +19918,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 "Coins" @@ -19767,5 +19924,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 "Notes" @@ -19773,5 +19930,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 "Electronic purses and Charge cards" @@ -19779,5 +19936,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 "Debit cards" @@ -19785,5 +19942,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 "Credit cards" @@ -19842,10 +19999,144 @@ msgstr "Bench" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Back" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Memorial" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "none" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "place" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Colour" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Back" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "down" + +#. 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 "green" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "end" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Value" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "water" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Amount of Wires" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Hunting Stand" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" @@ -19854,30 +20145,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 "Height" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "low" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "half" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "full" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Hide" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Lock" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fountain" @@ -19886,10 +20177,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Drinking Water" @@ -19898,10 +20189,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -19909,35 +20200,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Shops" #. 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 "Edit Supermarket" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Chalet" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Edit Chalet" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Convenience Store" @@ -19945,9 +20234,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19955,29 +20244,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Edit 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 "Edit Bus Stop" - -#: 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 "Edit Tree" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Vending machine" @@ -19985,5 +20272,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -19991,88 +20278,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "food" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Butcher" @@ -20080,9 +20367,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Edit Butcher" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Baker" @@ -20090,9 +20377,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Edit Baker" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Florist" @@ -20100,18 +20387,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Edit Florist" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Organic" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alcohol" @@ -20119,54 +20406,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Beverages" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Electronics" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Furniture" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Garden Centre" @@ -20174,9 +20461,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Hardware" @@ -20184,9 +20471,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -20194,54 +20481,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Stationery" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Hairdresser" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Shoes" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Toys" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#: 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 "Edit Video Shop" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -20249,9 +20536,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Laundry" @@ -20259,9 +20546,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Edit Laundry" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Outdoor" @@ -20269,32 +20556,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Sports" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Optician" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Edit Optician" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -20302,14 +20589,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Edit Bank" -#: 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 "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Money Exchange" @@ -20317,5 +20604,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -20323,15 +20610,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Doctors" @@ -20339,18 +20626,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Edit Doctors" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dentist" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Edit Dentist" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Pharmacy" @@ -20358,5 +20645,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -20364,9 +20651,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Dispensing" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hospital" @@ -20374,10 +20661,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -20386,5 +20673,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -20393,20 +20680,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Phone Number" #. 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 "(Use international code, like +12-345-67890)" @@ -20414,5 +20701,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 "Veterinary" @@ -20421,55 +20708,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Edit Veterinary" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Edit Continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Country" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Edit Country" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "State" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Edit State" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Edit Region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "County" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Edit County" @@ -20477,15 +20764,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "City" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Edit City" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Town" @@ -20493,10 +20780,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Edit Town" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Suburb" @@ -20504,25 +20791,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Edit Village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Hamlet" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -20530,5 +20817,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Locality" @@ -20536,10 +20823,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Edit Locality" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Island" @@ -20547,24 +20834,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Edit Island" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "left" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Edit Chalet" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -20572,10 +20857,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Peak" @@ -20583,10 +20868,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Edit Peak" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Glacier" @@ -20594,10 +20879,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Volcano" @@ -20605,70 +20890,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Political" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "National park" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Tree" @@ -20677,15 +20962,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Wood" @@ -20694,5 +20979,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Edit Wood" @@ -20700,17 +20985,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 "coniferous" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Forest" @@ -20719,14 +21004,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Nature Reserve" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -20734,25 +21019,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Scree" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Scrub" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Fell" @@ -20760,10 +21045,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Heath" @@ -20771,5 +21056,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Edit Heath" @@ -20777,5 +21062,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Farmyard" @@ -20784,45 +21069,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Farmland" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Meadow" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vineyard" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Allotments" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -20830,25 +21115,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Garden" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Grass" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Village Green" @@ -20856,10 +21141,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Common" @@ -20867,20 +21152,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Edit Common" #. 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 "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -20888,5 +21173,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -20894,15 +21179,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Residential area" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Graveyard" @@ -20910,9 +21195,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cemetery" @@ -20920,39 +21205,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Retail" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Commercial" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Railway land" @@ -20960,15 +21245,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Military" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -20976,55 +21261,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Construction area" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Brownfield" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Greenfield" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Landfill" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Quarry" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -21034,5 +21319,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 "Edit Multipolygon" @@ -21041,10 +21326,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "outer segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "inner segment" @@ -21052,5 +21337,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Turn restriction" @@ -21059,5 +21344,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -21065,34 +21350,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "only straight on" @@ -21101,15 +21386,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "to way" @@ -21117,5 +21402,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Route" @@ -21124,5 +21409,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Edit Route" @@ -21130,5 +21415,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Route type" @@ -21136,5 +21421,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21200,5 +21485,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 @@ -21207,17 +21492,17 @@ msgstr "bicycle" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "road" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ski" @@ -21270,5 +21555,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 @@ -21277,13 +21562,13 @@ msgstr "foot" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "hiking" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "detour" @@ -21297,10 +21582,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Symbol description" @@ -21308,31 +21593,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Network" #. 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 "proposed" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Colour (hex)" @@ -21341,30 +21626,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "backward halt point" @@ -24517,76 +24802,4 @@ msgstr "historic" -#. 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 "green" - #. color green #. @@ -25554,12 +25767,232 @@ msgstr "Terraserver Urban" +#. 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 "All the ways were empty" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Merge nodes with different memberships?" + +#~ msgid "Merge Anyway" +#~ msgstr "Merge Anyway" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" + +#~ msgid "Unknown version" +#~ msgstr "Unknown version" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Version number missing from OSM data" + +#~ msgid "Found element in non-way." +#~ msgstr "Found element in non-way." + +#~ msgid " has zero ref" +#~ msgstr " has zero ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Found element in non-relation." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." + +#~ msgid "Ill-formed node id" +#~ msgstr "Ill-formed node id" + +#~ msgid "Move" +#~ msgstr "Move" + +#~ msgid "Data Layer" +#~ msgstr "Data Layer" + +#~ msgid "No document open so nothing to save." +#~ msgstr "No document open so nothing to save." + +#~ msgid "Unknown file extension." +#~ msgstr "Unknown file extension." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolve Conflicts" + +#~ msgid "Object" +#~ msgstr "Object" + +#~ msgid "There were conflicts during import." +#~ msgstr "There were conflicts during import." + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "Hint: Some changes came from uploading new data to the server." -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Please select ways with almost right angles to orthogonalise." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgid "my version:" +#~ msgstr "my version:" + +#~ msgid "their version:" +#~ msgstr "their version:" + +#~ msgid "resolved version:" +#~ msgstr "resolved version:" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contacting the OSM server..." + +#~ msgid "Aborting..." +#~ msgstr "Aborting..." + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "different" + +#~ msgid "true" +#~ msgstr "true" + +#~ msgid "false" +#~ msgstr "false" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Resolve {0} conflicts in {1} objects" + +#~ msgid "Change" +#~ msgstr "Change" + +#~ msgid "unnamed" +#~ msgstr "unnamed" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Cannot open preferences directory: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} object has conflicts:" +#~ msgstr[1] "{0} objects have conflicts:" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Click Reload to refresh list" + +#~ msgid "Date" +#~ msgstr "Date" + +#~ msgid "Revert" +#~ msgstr "Revert" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." + +#~ msgid "Email" +#~ msgstr "E-Mail" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM username (e-mail)" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin requires JOSM update: {0}." + +#~ msgid "Commit comment" +#~ msgstr "Commit comment" + +#~ msgid "Server does not support changesets" +#~ msgstr "Server does not support changesets" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (empty value deletes tag)" + +#~ msgid "Occupied By" +#~ msgstr "Occupied By" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Add all currently selected objects as members" + +#~ msgid "Add Selected" +#~ msgstr "Add Selected" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Remove the member in the current table row from this relation" + +#~ msgid "Error parsing server response." +#~ msgstr "Error parsing server response." + +#~ msgid "Cannot connect to server." +#~ msgstr "Cannot connect to server." + +#~ msgid "Tagging preset sources" +#~ msgstr "Tagging preset sources" + +#~ msgid "Tagging preset source" +#~ msgstr "Tagging preset source" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Add a new tagging preset source to the list." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Add either site-josm.xml or Wiki Pages." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin already exists" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." +#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Could not download plugin: {0} from {1}" + +#~ msgid "Rotate" +#~ msgstr "Rotate" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Delete {1} {0}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Some of the nodes are (almost) in the line" #~ msgid "" @@ -25570,316 +26003,6 @@ #~ "as a bug." -#~ msgid "No document open so nothing to save." -#~ msgstr "No document open so nothing to save." - -#~ msgid "Change {0} {1}" -#~ msgstr "Change {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Delete {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Remove relation member {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Cannot open preferences directory: {0}" - -#~ msgid "nodes" -#~ msgstr "nodes" - -#~ msgid "ways" -#~ msgstr "ways" - -#~ msgid "relations" -#~ msgstr "relations" - -#~ msgid "changesets" -#~ msgstr "changesets" - -#~ msgid "" -#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" -#~ msgstr "" -#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" - -#~ msgid "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " -#~ "was: {0}" -#~ msgstr "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " -#~ "was: {0}" - -#~ msgid "" -#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -#~ "Exception: {0}" -#~ msgstr "" -#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -#~ "Exception: {0}" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Failed to load history from the server. Details:
{0}" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" - -#~ msgid "Delete Layer" -#~ msgstr "Delete Layer" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Do you really want to delete layer ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Delete all" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Deleting layer {0} of {1}" - -#~ msgid "" -#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" - -#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" -#~ msgstr "Warning: failed to put dialog always on top. Exception was: {0}" - -#~ msgid "" -#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Authors: {0}" - -#~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" -#~ msgstr "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" - -#~ msgid "" -#~ "Warning: failed to put history browser always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warning: failed to put history browser always on top. Exception was: {0}" - -#~ msgid "" -#~ "Failed to close changeset {0}, will be closed by server after timeout. " -#~ "Exception was: {1}" -#~ msgstr "" -#~ "Failed to close changeset {0}, will be closed by server after timeout. " -#~ "Exception was: {1}" - -#~ msgid "Public" -#~ msgstr "Public" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Selected makes your trace public in openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." - -#~ msgid "Continue anyway" -#~ msgstr "Continue anyway" - -#~ msgid "Copy Default" -#~ msgstr "Copy Default" - -#~ msgid "Edit Information Office" -#~ msgstr "Edit Information Office" - -#~ msgid "Map Type" -#~ msgstr "Map Type" - -#~ msgid "map" -#~ msgstr "map" - -#~ msgid "citymap" -#~ msgstr "citymap" - -#~ msgid "hikingmap" -#~ msgstr "hikingmap" - -#~ msgid "bicyclemap" -#~ msgstr "bicyclemap" - -#~ msgid "Board Type" -#~ msgstr "Board Type" - -#~ msgid "board" -#~ msgstr "board" - -#~ msgid "Move" -#~ msgstr "Move" - -#~ msgid "Data Layer" -#~ msgstr "Data Layer" - -#~ msgid "Unknown file extension." -#~ msgstr "Unknown file extension." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolve Conflicts" - -#~ msgid "Object" -#~ msgstr "Object" - -#~ msgid "There were conflicts during import." -#~ msgstr "There were conflicts during import." - -#~ msgid "my version:" -#~ msgstr "my version:" - -#~ msgid "their version:" -#~ msgstr "their version:" - -#~ msgid "resolved version:" -#~ msgstr "resolved version:" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contacting the OSM server..." - -#~ msgid "Aborting..." -#~ msgstr "Aborting..." - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "different" - -#~ msgid "true" -#~ msgstr "true" - -#~ msgid "false" -#~ msgstr "false" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Resolve {0} conflicts in {1} objects" - -#~ msgid "Change" -#~ msgstr "Change" - -#~ msgid "unnamed" -#~ msgstr "unnamed" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} object has conflicts:" -#~ msgstr[1] "{0} objects have conflicts:" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Click Reload to refresh list" - -#~ msgid "Date" -#~ msgstr "Date" - -#~ msgid "Revert" -#~ msgstr "Revert" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." - -#~ msgid "Email" -#~ msgstr "E-Mail" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "end" -#~ msgstr "end" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM username (e-mail)" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin requires JOSM update: {0}." - -#~ msgid "Commit comment" -#~ msgstr "Commit comment" - -#~ msgid "Server does not support changesets" -#~ msgstr "Server does not support changesets" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (empty value deletes tag)" - -#~ msgid "Occupied By" -#~ msgstr "Occupied By" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Add all currently selected objects as members" - -#~ msgid "Add Selected" -#~ msgstr "Add Selected" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Remove the member in the current table row from this relation" - -#~ msgid "Error parsing server response." -#~ msgstr "Error parsing server response." - -#~ msgid "Cannot connect to server." -#~ msgstr "Cannot connect to server." - -#~ msgid "Tagging preset sources" -#~ msgstr "Tagging preset sources" - -#~ msgid "Tagging preset source" -#~ msgstr "Tagging preset source" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Add a new tagging preset source to the list." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Add either site-josm.xml or Wiki Pages." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin already exists" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." -#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Could not download plugin: {0} from {1}" - -#~ msgid "Rotate" -#~ msgstr "Rotate" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Some of the nodes are (almost) in the line" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Please select ways with almost right angles to orthogonalise." #~ msgid "Really mark this issue as ''done''?" @@ -25911,4 +26034,7 @@ #~ msgstr "rectifier id={0}" +#~ msgid "Copy Default" +#~ msgstr "Copy Default" + #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Adjust the position of the WMS layer" @@ -25928,4 +26054,19 @@ #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "citymap" +#~ msgstr "citymap" + +#~ msgid "hikingmap" +#~ msgstr "hikingmap" + +#~ msgid "map" +#~ msgstr "map" + +#~ msgid "bicyclemap" +#~ msgstr "bicyclemap" + +#~ msgid "board" +#~ msgstr "board" #~ msgid "Charge" @@ -26026,4 +26167,7 @@ #~ "{0}" +#~ msgid "Authors: {0}" +#~ msgstr "Authors: {0}" + #~ msgid "Layers: {0}" #~ msgstr "Layers: {0}" @@ -26045,4 +26189,10 @@ #~ msgid "sports" #~ msgstr "sports" + +#~ msgid "Public" +#~ msgstr "Public" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Selected makes your trace public in openstreetmap.org" #~ msgid "Select Tableau d'Assemblage" @@ -26060,4 +26210,7 @@ #~ msgstr "Basic" +#~ msgid "Delete Layer" +#~ msgstr "Delete Layer" + #~ msgid "Delete and Download" #~ msgstr "Delete and Download" @@ -26065,4 +26218,10 @@ #~ msgid "No intersections found. Nothing was changed." #~ msgstr "No intersection found. Nothing was changed." + +#~ msgid "Continue anyway" +#~ msgstr "Continue anyway" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgid "Move Down" @@ -26107,4 +26266,13 @@ #~ "No data to update found. Have you already opened or downloaded a data " #~ "layer?" + +#~ msgid "Board Type" +#~ msgstr "Board Type" + +#~ msgid "Edit Information Office" +#~ msgstr "Edit Information Office" + +#~ msgid "Map Type" +#~ msgstr "Map Type" #~ msgid "Directly load TCX files from JOSM." @@ -26185,10 +26353,4 @@ #~ msgstr "linked" -#~ msgid "Overlap tiles" -#~ msgstr "Overlap tiles" - -#~ msgid "% of lat:" -#~ msgstr "% of lat:" - #~ msgid "% of lon:" #~ msgstr "% of lon:" @@ -26261,4 +26423,16 @@ #~ msgstr "Selection too big" +#~ msgid "nodes" +#~ msgstr "nodes" + +#~ msgid "ways" +#~ msgstr "ways" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "changesets" +#~ msgstr "changesets" + #~ msgid "Error when communicating with server." #~ msgstr "Error when communicating with server." @@ -26276,4 +26450,82 @@ #~ msgstr "API initialisation failed" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Failed to load history from the server. Details:
{0}" + #~ msgid "No data" #~ msgstr "No data" + +#~ msgid "Change {0} {1}" +#~ msgstr "Change {0} {1}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Remove relation member {0} {1}" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" + +#~ msgid "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" + +#~ msgid "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Do you really want to delete layer ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Delete all" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "Warning: failed to put dialog always on top. Exception was: {0}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Deleting layer {0} of {1}" + +#~ msgid "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" + +#~ msgid "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 17594) +++ /applications/editors/josm/i18n/po/es.po (revision 17595) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-01 16:33+0000\n" -"Last-Translator: Jesús Gómez Fernández \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-09 18:31+0000\n" +"Last-Translator: Emilio Gomez Fernandez \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\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:37+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 "Ayuda" -#: ../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 "No se ha podido activar la proyección {0}. Usando Mercator." -#: ../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,55 @@ #: ../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 "Error" -#: ../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] "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" -msgstr[1] "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios y " +"continuar?" +msgstr[1] "" +"Existen cambios sin guardar en las capas {0}. ¿Desea descartar los cambios y " +"continuar?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Cambios no guardados" -#: ../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 "Guardar y salir" -#: ../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 "Descartar y salir" -#: ../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 +160,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 +179,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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formado: \"{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 +209,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,15 +248,18 @@ msgstr "Advertencia" -#: ../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 "Ignorando URL de archivo malformado: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "No puede leerse el archivo ''{0}''. El error es:
{1}" +msgstr "" +"No se puede leer el archivo ''{0}''.
El error es:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -339,5 +346,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 "Complementos" @@ -352,22 +359,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"ADVERTENCIA: el formato inesperado de API base URL. Re dirección a la página " -"de historia para OSM primitivo probablemente fallará . Los API base URL es: " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"ADVERTENCIA: el formato inesperado de API base URL. Re dirección a la página " -"de historia para OSM primitivo probablemente fallará . Los API base URL es: " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -477,9 +478,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 @@ -513,6 +514,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 @@ -531,11 +532,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 "Información" @@ -557,5 +558,5 @@ msgstr "Por favor seleccione como mínimo tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -566,10 +567,10 @@ "actual es {0}, el máximo es {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 "Violación de la capacidades del API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -580,5 +581,5 @@ "la primitiva suprimida {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -589,9 +590,9 @@ "máxima longitud permitida {2}. Los valores de longitud son {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Violación de la condición previa" -#: ../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}" @@ -623,10 +624,10 @@ #, java-format msgid "Zoom to {0}" -msgstr "Aumente a {0}" +msgstr "Zoom a {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom the view to {0}." -msgstr "Aumentar la vista a {0}." +msgstr "Zoom de la vista a {0}" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 @@ -640,82 +641,66 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "Nothing selected to zoom to." -msgstr "Nada seleccionado para aumentar" +msgstr "Nada seleccionado a lo que hacer zoom" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "No conflicts to zoom to" -msgstr "No hay conflictos para aumentar" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +msgstr "No existen conflictos a los que hacer zoom" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine Way" msgstr "Combinar vía" -#: ../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 "Combinar varias vías en una." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "¿Combinar vías con diferentes relaciones?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Combinar de todos modos" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "¿Cambiar direcciones?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Invertir y combinar" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"No se pueden combinar las vías con sus direcciones actuales. ¿Desea invertir " +"alguna de ellas?" + +#: ../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 "" +"No se han podido combinar las vías (no se han podido unir en una cadena " +"única de nodos)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Combinar {0} vías" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona al menos dos vías para combinar." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "¿Combinar vías con diferentes relaciones?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Combinar de todos modos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "¿Cambiar direcciones?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Invertir y combinar" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"No se pueden combinar las vías con sus direcciones actuales. ¿Desea invertir " -"alguna de ellas?" - -#: ../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 "Introduzca valores para todos los conflictos." - -#: ../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 "Resolver conflictos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Combinar {0} vías" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Todas la vías están vacías" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"No se han podido combinar las vías (no se han podido unir en una cadena " -"única de nodos)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -771,5 +756,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 "Borrar" @@ -779,15 +764,15 @@ msgstr "Eliminar objetos seleccionados." -#: ../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 "Sobrescribir" -#: ../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 "El archivo existe. ¿Sobrescribir?" @@ -818,10 +803,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}" @@ -853,5 +838,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 @@ -894,7 +879,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Todas las imágenes" +msgstr "Todos los formatos" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1033,1082 +1017,25 @@ msgstr "Unir la capar actual en otrar capa" -#: ../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 "Unir nodos" -#: ../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 "Unir nodos en el más antiguo." -#: ../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 "Por favor seleccione por lo menos dos nodos para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "¿Unir nodos con diferentes relaciones?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Unir de todos modos" - -#: ../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 "" -"Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que " -"quiere unirlos?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"No se pueden unir los nodos: Habría que borrar una vía que todavía está en " -"uso." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Unir {0} nodos" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Unir la selección" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Unir la primitiva seleccionada actual en otra capa" - -#: ../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 "Invertir" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Invertir los nodos y vías seleccionadas" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Por favor, seleccione al menos un nodo o vía" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "arriba" - -#: ../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 "Mover objetos {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "abajo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "Izquierda" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "derecha" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Mover {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Mover objetos {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 "Imposible mover objetos fuera del mundo." - -#: ../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 "Nuevo" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Crear un nuevo mapa." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Abrir..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Abrir un archivo." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Abrir un archivo." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Rol ''{0}'' desconocido." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Abrir dirección..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Abrir una URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separar capa" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Introduzca URL a descargar" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Descargar ubicación" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL de descarga" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ortogonalizar forma" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Solo se permiten dos nodos" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "La selección debe consistir solo en vías." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Por favor, seleccione una o más vías cerradas de al menos cuatro nodos." - -#: ../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 "" -"Está usando el proyecto EPSG:4326 el cual podría dar lugar
a " -"indeseables resultados cuando haga alineamientos rectangulares.
Cambie su " -"proyección para conseguir eliminar esta advertencia.
¿Desea continuar?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Solo hay un nodo seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ortogonalizar" - -#: ../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 "Pegar" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Pegar los contenidos de la memoria de pegado" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Pegar etiquetas" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Aplicar las etiquetas guardadas en la memoria de pegado a todos los " -"elementos seleccionados" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Cargando {0}" -msgstr[1] "Cargando {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Deshacer borrado de {0} primitivas" -msgstr[1] "Deshacer borrado de {0} primitivas" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferencias..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Abrir la ventana de preferencias globales." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferencias" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Rehacer" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Restaurar la última acción deshecha" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Cambiar nombre de la capa" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "También cambiar nombre del archivo" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "No se puede reombrar el archivo ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Cambiar el sentido de las vías" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Invertir el sentido de todas las vías seleccionadas." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Por favor seleccione por lo menos una vía." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Cambiar el sentido de las vías" - -#: ../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 "Guardar" - -#: ../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 "Guardar los datos actuales." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "El archivo {0} existe. ¿Sobrescribir?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "No se ecnotró exportador. Nada guardado." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Documento vacío" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "El documento no contiene datos." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Guardar igualmente" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflictos" - -#: ../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 "" -"Existen conflictos sin resolver. Los conflictos no se guardarán ni se " -"gestionarán como si rechazara todo. ¿Continuar?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Rechazar conflictos y guardar" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Guardar el archivo OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Guardar el archivo GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Guardar capa" - -#: ../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 "Guardar como..." - -#: ../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 "Guardar los datos actuales en un nuevo archivo." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Seleccionar todo" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Seleccionar todos los objetos no borrados de la capa de datos. Esto también " -"selecciona los objetos incompletos." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Mostrar informe de estado" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Mostrar informe de situación con información útil que se puede asociar a los " -"errores." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Ayuda: : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Informe de estado" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copiar al portapapeles y cerrar" - -#: ../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 "Cerrar" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Separar vía" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Separar vía por el nodo seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "La selección actual no se puede usar para separar." - -#: ../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] "El nodo seleccionado no está en medio de ninguna vía" -msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía" - -#: ../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] "" -"Hay más de una vía utilizando el nodo que ha seleccionado. Por favor " -"seleccione la vía también." -msgstr[1] "" -"Hay más de una vía utilizando los nodos que ha seleccionado. Por favor " -"seleccione la vía también." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Los nodos seleccionados no comparten la misma vía." - -#: ../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] "La vía seleccionada no contiene el nodo seleccionado." -msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados." - -#: ../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 "Debe seleccionar dos o más nodos para dividir una vía circular." - -#: ../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 "" -"No se pueden dividir la vía por los nodos seleccionados. (Pista: seleccione " -"nodos de la mitad de la vía)." - -#: ../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 "" -"Una parte basada en la relación de miembros fue copiada a todas las " -"rutas.
Debería verificar esto y corregirlo cuando sea necesario." - -#: ../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 "" -"Una relación de miembros fue copiada a todas las rutas.
Deberería " -"verificar y corregirlo cuando sea necesareo." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 -#, java-format -msgid "Split way {0} into {1} parts" -msgstr "Dividir la vía {0} en {1} partes" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Cerrando conjunto de cambios..." - -#: ../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 "Cerrando conjunto de cambios..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "No existe alctualmente ningua capa WMS que ajustar." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Abriendo conjunto de cambios..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Cerrando conjunto de cambios..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Cambiar de estado las líneas GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Cambiar de estado el ajuste global ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Despegar vías" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplicar nodos usados por varias vías." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Este nodo no está pegado a ninguna otra cosa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "La selección actual no se puede usar para despegar." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Selecione alguno:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Un nodo etiquetado, o" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Un nodo que sea usado por más de una vía, o" - -#: ../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 "* Un nodo usado por más de una vía y una de esas vías, o" - -#: ../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 "* Una vía que tenga un nodo o más usado por más de una vía, o" - -#: ../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 "*Una vía y un nodo o más de sus nodos usados por más de una vía." - -#: ../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 "" -"Nota: Si se selecciona una vía ésta recibirá copias actualizadas de los\n" -"nodos despegados y se seleccionarán los nuevos nodos. De lo contrario,\n" -"todas las vías obtendrán su propia copia y todos los nodos serán " -"seleccionados." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nodo despegado" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplicado dentro de {0} nodos" - -#. 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 "{0} nodos duplicados dentro de {1} nodos" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Deshacer" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Deshacer la última acción" - -#: ../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 "Deseleccionar todo" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Deseleccionar todos los objetos" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Deseleccionar todas (Foco)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Deseleccionar todos (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Actualizar datos" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Actualiza la actual capa de datos desde el servidor (re-descargas de datos)" - -#. 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 "Actualizando datosd" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "Actualización de datos no encontrada" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "No encontró sencillo id{0} en el conjunto de datos actual" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Actualización de selección" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "No hay primitivas seleccionadas para actualizar" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Selección vacía" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Subir a OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Subir todos los cambios al servidor OSM." - -#: ../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 "" -"Existen algunos conflictos sin resolver. Tienes que solucionarlos primero." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nada que subir. Consigue algunos datos primero." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Ningún cambio que subir" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Sincronizar {0} {1} únicamente" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Sincronizar el conjunto de datos completo" - -#: ../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 "" -"La subida falló debido a que el servidor tiene una " -"versión más reciente de uno
de sus nodos, vías o relaciones.
El " -"conflicto es causado por el {0} con ID {1}," -"
el servidor tiene la versión {2}, su versión es {3}.

Pulse " -"{4} para sincronizar los primitivos en conflicto únicamente." -"
Pulse {5} para sincronizar el conjunto de datos local " -"completo con el servidor.
Pulse {6} para abortar y " -"continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Conflicto detectado" - -#. 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 "Retorno de valor inexperado. Obtenido {0}" - -#: ../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 "" -"La subida falló porque el servidor tiene una versión " -"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " -"{0} para sincronizar el conjunto de datos local completo con el " -"servidor.
Pulse {1} para abortar y continuar editando." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Advertencia: la cabecera errónea \"{0}\" no concuerda con el patrón esperado " -"\"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Subida fallida.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Subida a la API de OSM fallida" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "¿Subir estos cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Subir cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Editar una nueva relación en la capa \"{0}\"" - -#: ../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 "Añadir un nodo nuevo a una vía existente" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "subir todos los cambios en una petición" - -#: ../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 "" -"Permitir subir todos los cambios en una petición, no permitir usar una " -"petición por cambio sencillo" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Ajustes del mapa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "conjunto de cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objetos que añadir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objetos que modificar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objetos que borrar:" - -#: ../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] "Objetos que añadir:" -msgstr[1] "Objetos que añadir:" - -#: ../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] "Objetos que modificar:" -msgstr[1] "Objetos que modificar:" - -#: ../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] "Objetos que borrar:" -msgstr[1] "Objetos que borrar:" - -#: ../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 "Último cambio en {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Acercar" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Alejar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Retroceder" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Atrás." - -#: ../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 "Más rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Avance rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Avanzar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Salta hacia delante" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Marcador siguiente" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Reproducir marcador siguiente." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Reproducción/Pausa" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Reproducir/pausar audio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Marcador anterior" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Reproducir marcador anterior" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Más lento" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Avance lento" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Descargando datos GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Datos GPX descargados" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Datos GPS en bruto" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Descargando datos" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" -"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "No se importó ningún dato." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Datos OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Descargando {0} de {1} ({2} pendientes)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Errores durante la descarga" - -#: ../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 "" -"Hay {0} primitivas en su conjunto local de datos que
pueden estar " -"borradas en el servidor. Si posteriormente trata de borrarlas " -"o
actualizarlas probablemente el servidor informará de un
conflicto." -"

Pulse {1} para comprobar el estado de estas " -"primitivas
en el servidor-
Pulse {2} para ignorar." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Primitivas movidas o borradas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Modo de borrado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Borrar nodos o vías." - -#: ../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 "Modo: {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 "" -"Clic para borrar. Con mayúscula: borrar segmento de vía. Con Alt: no borrar " -"los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos." - +#: ../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 @@ -2119,7 +1046,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 @@ -2128,6 +1056,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 @@ -2158,4 +1086,922 @@ msgstr "el parámetro ''{0}'' no debe ser nulo" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"No se pueden unir los nodos: Habría que borrar una vía que todavía está en " +"uso." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Unir {0} nodos" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Unir la selección" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Unir la primitiva seleccionada actual en otra capa" + +#: ../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 "Invertir" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Invertir los nodos y vías seleccionadas" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Por favor, seleccione al menos un nodo o vía" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "arriba" + +#: ../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 "Mover objetos {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "abajo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "Izquierda" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "derecha" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Mover {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Mover objetos {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 "Imposible mover objetos fuera del mundo." + +#: ../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 "Nuevo" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Crear un nuevo mapa." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Abrir..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Abrir un archivo." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Abriendo archivos" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Abriendo archivo ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Abrir dirección..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Abrir una URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separar capa" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Introduzca URL a descargar" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Descargar ubicación" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL de descarga" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ortogonalizar forma" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Solo se permiten dos nodos" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "La selección debe consistir solo en vías." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Por favor, seleccione una o más vías cerradas de al menos cuatro nodos." + +#: ../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 "" +"Está usando el proyecto EPSG:4326 el cual podría dar lugar
a " +"indeseables resultados cuando haga alineamientos rectangulares.
Cambie su " +"proyección para conseguir eliminar esta advertencia.
¿Desea continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Solo hay un nodo seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ortogonalizar" + +#: ../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 "Pegar" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Pegar los contenidos de la memoria de pegado" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Pegar etiquetas" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Aplicar las etiquetas guardadas en la memoria de pegado a todos los " +"elementos seleccionados" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Pegando {0} etiqueta" +msgstr[1] "Pegando {0} etiquetas" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "a {0} primitiva" +msgstr[1] "a {0} primitivas" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Preferencias..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Abrir la ventana de preferencias globales." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferencias" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Rehacer" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Restaurar la última acción deshecha" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Cambiar nombre de la capa" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "También cambiar nombre del archivo" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "No se puede reombrar el archivo ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Cambiar el sentido de las vías" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Invertir el sentido de todas las vías seleccionadas." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Por favor seleccione por lo menos una vía." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Cambiar el sentido de las vías" + +#: ../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 "Guardar" + +#: ../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 "Guardar los datos actuales." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "El archivo {0} existe. ¿Sobrescribir?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "No se ecnotró exportador. Nada guardado." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Documento vacío" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Guardar igualmente" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "El documento no contiene datos." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflictos" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Rechazar conflictos y guardar" + +#: ../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 "" +"Existen conflictos sin resolver. Los conflictos no se guardarán ni se " +"gestionarán como si rechazara todo. ¿Continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Guardar el archivo OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Guardar el archivo GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Guardar capa" + +#: ../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 "Guardar como..." + +#: ../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 "Guardar los datos actuales en un nuevo archivo." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Seleccionar todo" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Seleccionar todos los objetos no borrados de la capa de datos. Esto también " +"selecciona los objetos incompletos." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Mostrar informe de estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Mostrar informe de situación con información útil que se puede asociar a los " +"errores." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Ayuda: : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Informe de estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copiar al portapapeles y cerrar" + +#: ../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 "Cerrar" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Separar vía" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Separar vía por el nodo seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "La selección actual no se puede usar para separar." + +#: ../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] "El nodo seleccionado no está en medio de ninguna vía" +msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía" + +#: ../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] "" +"Hay más de una vía utilizando el nodo que ha seleccionado. Por favor " +"seleccione la vía también." +msgstr[1] "" +"Hay más de una vía utilizando los nodos que ha seleccionado. Por favor " +"seleccione la vía también." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Los nodos seleccionados no comparten la misma vía." + +#: ../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] "La vía seleccionada no contiene el nodo seleccionado." +msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados." + +#: ../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 "Debe seleccionar dos o más nodos para dividir una vía circular." + +#: ../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 "" +"No se pueden dividir la vía por los nodos seleccionados. (Pista: seleccione " +"nodos de la mitad de la vía)." + +#: ../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 "" +"Una parte basada en la relación de miembros fue copiada a todas las " +"rutas.
Debería verificar esto y corregirlo cuando sea necesario." + +#: ../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 "" +"Una relación de miembros fue copiada a todas las rutas.
Deberería " +"verificar y corregirlo cuando sea necesareo." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Dividir la vía {0} en {1} partes" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Cerrar el actual conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Cerrar el conjunto de cambios actual..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Actualmente no hay un conjunto cambios abierto." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "No abrir un conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Cerrando conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Cambiar de estado las líneas GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Cambiar de estado el ajuste global ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Despegar vías" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplicar nodos usados por varias vías." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Este nodo no está pegado a ninguna otra cosa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "La selección actual no se puede usar para despegar." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Selecione alguno:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Un nodo etiquetado, o" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Un nodo que sea usado por más de una vía, o" + +#: ../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 "* Un nodo usado por más de una vía y una de esas vías, o" + +#: ../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 "* Una vía que tenga un nodo o más usado por más de una vía, o" + +#: ../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 "*Una vía y un nodo o más de sus nodos usados por más de una vía." + +#: ../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 "" +"Nota: Si se selecciona una vía ésta recibirá copias actualizadas de los\n" +"nodos despegados y se seleccionarán los nuevos nodos. De lo contrario,\n" +"todas las vías obtendrán su propia copia y todos los nodos serán " +"seleccionados." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nodo despegado" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplicado dentro de {0} nodos" + +#. 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 "{0} nodos duplicados dentro de {1} nodos" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Deshacer" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Deshacer la última acción" + +#: ../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 "Deseleccionar todo" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Deseleccionar todos los objetos" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Deseleccionar todas (Foco)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Deseleccionar todos (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Actualizar datos" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Actualiza la actual capa de datos desde el servidor (re-descargas de datos)" + +#. 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 "Actualizando datosd" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Actualización de datos no encontrada" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "No encontró sencillo id{0} en el conjunto de datos actual" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Actualización de selección" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "No hay primitivas seleccionadas para actualizar" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Selección vacía" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Subir a OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Subir todos los cambios al servidor OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"No hay capas de capa fuente
\"{0}\"
podría ser unida a." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Nada que subir. Consigue algunos datos primero." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Ningún cambio que subir" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Sincronizar {0} {1} únicamente" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Sincronizar el conjunto de datos completo" + +#: ../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 "" +"La subida falló debido a que el servidor tiene una " +"versión más reciente de uno
de sus nodos, vías o relaciones.
El " +"conflicto es causado por el {0} con ID {1}," +"
el servidor tiene la versión {2}, su versión es {3}.

Pulse " +"{4} para sincronizar los primitivos en conflicto únicamente." +"
Pulse {5} para sincronizar el conjunto de datos local " +"completo con el servidor.
Pulse {6} para abortar y " +"continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Conflicto detectado" + +#. 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 "Retorno de valor inexperado. Obtenido {0}" + +#: ../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 "" +"La subida falló porque el servidor tiene una versión " +"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " +"{0} para sincronizar el conjunto de datos local completo con el " +"servidor.
Pulse {1} para abortar y continuar editando." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Advertencia: la cabecera errónea \"{0}\" no concuerda con el patrón esperado " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Subida fallida.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Subida a la API de OSM fallida" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Actualizando primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Subiendo datos de la capa \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Acercar" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Alejar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Retroceder" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Atrás." + +#: ../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 "Más rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Avance rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Avanzar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Salta hacia delante" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Marcador siguiente" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Reproducir marcador siguiente." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Reproducción/Pausa" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Reproducir/pausar audio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Marcador anterior" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Reproducir marcador anterior" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Más lento" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Avance lento" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Descargando datos GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Datos GPX descargados" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Datos GPS en bruto" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Descargando datos" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "No se importó ningún dato." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Datos OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Descargando {0} de {1} ({2} pendientes)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Errores durante la descarga" + +#: ../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 "" +"Hay {0} primitivas en su conjunto local de datos que
pueden estar " +"borradas en el servidor. Si posteriormente trata de borrarlas " +"o
actualizarlas probablemente el servidor informará de un
conflicto." +"

Pulse {1} para comprobar el estado de estas " +"primitivas
en el servidor-
Pulse {2} para ignorar." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Primitivas movidas o borradas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Modo de borrado" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Borrar nodos o vías." + +#: ../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 "Modo: {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 "" +"Clic para borrar. Con mayúscula: borrar segmento de vía. Con Alt: no borrar " +"los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2273,18 +2119,18 @@ "en ese punto." -#: ../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 "Seleccionar" -#: ../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 "Seleccionar, mover y rotar objetos" -#: ../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" @@ -2293,18 +2139,18 @@ msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Moverlos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Deshacer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2312,11 +2158,11 @@ "Really move them?" msgstr "" -"Movió más de {0} elementos. Desplazar un gran número de elementos es a " -"menudo un error.\n" -"¿Quiere moverlos realmente?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +"Has movido más de {0} elementos. El mover un número elevado de elementos es " +"frecuentemente un error.\n" +"¿Deseas moverlos realmente?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2338,5 +2184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 msgid "Zoom" -msgstr "Ampliar/reducir" +msgstr "Zoom" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 @@ -2440,7 +2286,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objetos con un ID determinado" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2498,41 +2343,41 @@ msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../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 "No se encontraron coincidencias para \"{0}\"" -#: ../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 "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../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 "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../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 "Se han encontrado {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2546,5 +2391,5 @@ "{2}" -#: ../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 "" @@ -2552,10 +2397,10 @@ "de uso: clave=valor" -#: ../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" @@ -2564,26 +2409,26 @@ "relación" -#: ../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 "Credencial de autentificación inexperada: {0}" -#: ../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 "No se encuentran los argumentos de or" -#: ../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 "No se encuentran los argumentos de not" -#: ../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 "Se esperaba un cierre de paréntesis." -#: ../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 "Número de parámetros incorrecto para el operador de nodos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2594,5 +2439,5 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../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." @@ -2629,62 +2474,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Añadir nodo" +msgstr "Añadir nodo {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Añadir {0} {1}" +msgstr "Añadir vía {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relaciones: {0}" +msgstr "Añadir relación {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Conjunto de cambios {0}" +msgstr "cambier nodo {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Conjunto de cambios {0}" +msgstr "Cambiar vía {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Cambiar relación" +msgstr "Cambiar relación {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Eliminar \"{0}\" de {1} ''{2}''" +msgstr "Eliminar \"{0}\" por nodo ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Eliminar \"{0}\" de {1} ''{2}''" +msgstr "Eliminar \"{0}\" para vía ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Eliminar \"{0}\" de {1} ''{2}''" +msgstr "Eliminar \"{0}\" para la relación ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Establecer {0}={1} para {2} ''{3}''" +msgstr "Set {0}={1} for node ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Establecer {0}={1} para {2} ''{3}''" +msgstr "Fijar {0}={1} para la vía ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Establecer {0}={1} para {2} ''{3}''" +msgstr "Fijar {0}={1} para la relación ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2730,4 +2575,6 @@ "primitmive ''{1}''" msgstr "" +"AVISO: la capa ''{0}'' ya no existe. No se puede eliminar el conflicto para " +"la primitiva \"{1}''" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2756,30 +2603,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] "Borrar {0} {1}" -msgstr[1] "Borrar {0} {1}" +msgstr[0] "Eliminar {0} objeto" +msgstr[1] "Eliminar {0} objetos" #: ../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] "Modo de borrado" -msgstr[1] "Modo de borrado" +msgstr[0] "Eliminar {0} nodo" +msgstr[1] "Eliminar {0} nodos" #: ../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] "Borrar {0} {1}" -msgstr[1] "Borrar {0} {1}" +msgstr[0] "Eliminar {0} vía" +msgstr[1] "Eliminar {0} vías" #: ../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] "Borrar de la relación" -msgstr[1] "Borrar de la relación" +msgstr[0] "Eliminar {0} relación" +msgstr[1] "Eliminar {0} relaciones" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2793,21 +2640,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol " -"{2}.\n" -"¿Borrar de la relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"La selección \"{0}\" está siendo usada por la relación \"{1}\".\n" -"¿Borrar de la relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2818,5 +2660,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." @@ -2899,17 +2741,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2919,17 +2761,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Resolver conflictos de versión para {0} {1}" +msgstr "Resolver conflictos de versión para el nodo {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Resolver conflictos de versión para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Resolver conflictos de versión para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3052,4 +2894,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"Aviso: Falta el archivo de preferencias ''{0}''. Creando un archivo de " +"preferencias por defecto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -3059,4 +2903,6 @@ "file." msgstr "" +"Aviso: Reemplazando el archivo de preferencias ''{0}'' existente por el " +"archivo por defecto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 @@ -3068,11 +2914,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"El archivo de preferencias contiene errores. Realizando copia de seguridad " -"de uno antiguo a {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3139,5 +2983,5 @@ msgstr "E" -#: ../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 @@ -3145,22 +2989,47 @@ msgstr "Conjunto de cambios {0}" -#: ../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 "parámetro {0} > 0 necesario. Obtenido {1}." -#: ../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 "el parámetro ''{0}'' no debe ser nulo" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../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 "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "índice de columna inexperado. Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257 msgid "a primitive with id=0 can't be invisible" -msgstr "" +msgstr "una proimitiva con id=0 no puede ser invisible" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Credencial de autentificación inexperada: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Credencial de autentificación inexperada: {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3174,11 +3043,16 @@ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\"" -#: ../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 "" @@ -3233,9 +3107,9 @@ msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" -#: ../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 "Vía de tipo área sin cerrar" -#: ../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." @@ -3244,118 +3118,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 "Miembro vacío en la relación." -#: ../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 "Miembro ''{0}'' borrado en la relación." -#: ../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 "Vía ''{0}'' con menos de dos puntos." -#: ../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 "Se ha encontrado más de una vía \"desde\"." -#: ../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 "Se ha encontrado más de una vía \"a\"." -#: ../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 "Se ha encontrado más de un elemento \"vía\"." -#: ../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 "Rol ''{0}'' desconocido." -#: ../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 "Tipo de miembro \"{0}\" desconocido." -#: ../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 "No se ha encontrado ninguna vía \"desde\"." -#: ../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 "No se ha encontrado ninguna vía \"a\"." -#: ../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 "No se ha encontrado ningún nodo o vía con el rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java: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 "La vía \"desde\" no comienza o termina en un nodo \"vía\"." -#: ../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 "La vía \"a\" no comienza o termina en un nodo \"vía\"." -#: ../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 "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java: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 "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "No se ha encontrado el estilo para la restricción {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." -#: ../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 "La no-vía ''{0}'' en multipolígono" -#: ../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 "Ninguna vía exterior en el multipolígono ''{0}''." -#: ../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 "Intersección entre las vías ''{0}'' y ''{1}''." -#: ../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 "La vía interior ''{0}'' se encuentra en la parte de fuera." -#: ../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 "El estilo de la vía interior ''{0}'' es igual al del multipolígono" -#: ../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 "El estilo de la vía exterior ''{0}'' no coincide." -#: ../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 "sin etiquetar" -#: ../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 "texto" @@ -3381,5 +3255,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" @@ -3390,5 +3264,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" @@ -3399,5 +3273,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" @@ -3480,7 +3354,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "No se ha podido leer los marcadores.
{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3511,5 +3385,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "ferrocarril" @@ -3541,135 +3415,34 @@ msgstr[1] "miembros {0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"No se ha podido iniciar la comunicación con el servidor de OSM {0}.\n" -"Compruebe la URL del servidor en sus preferencias y su conexión a Internet." - -#. 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 "desconocido" - -#: ../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 "" -" Subida al servidor fallida debido a que su actual " -"conjunto de datos
viola una condición previa.
El mensaje de error es:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Violación de condición previa" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Excepción de seguridad" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Excepción de red" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" msgstr "Excepción IO" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 +msgstr "Error interno del servidor" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Editar raqueta" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Host desconocido" -#: ../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 "" -" Subida falladadebido a que ha intentado eliminar " -"una primitiva
en el servidor la cual ya está eliminada.
El mensaje " -"de error es:
{0} " - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitiva ya eliminada" @@ -3817,5 +3590,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/PATH/TO/JOSM/FOLDER/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3888,5 +3661,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}" @@ -4289,4 +4062,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 @@ -4363,8 +4138,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 @@ -4504,5 +4279,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 "borrado" @@ -4562,10 +4337,10 @@ #: ../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 "No, abortar" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4573,7 +4348,4 @@ "yo agree?" msgstr "" -" Para mantener su versión local JOSM
tiene que restablecer el " -"identificador de {0} {1} a 0.
En la siguiente subida al servidor se le " -"asignará
un nuevo identificador.
¿Está de acuerdo? " #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4605,4 +4377,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 @@ -4616,5 +4389,5 @@ msgstr "Primitiva" -#: ../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 "" @@ -4724,4 +4497,40 @@ msgstr "Su conjunto de datos no incluye una etiqueta con la clave {0}" +#: ../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 "Ningún conflito de etiqueta pendiente de ser resuelto" + +#: ../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 "Aplicar" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4734,24 +4543,23 @@ msgstr "todos" -#: ../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 "Seleccionar una color" - -#: ../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 -#, fuzzy, java-format +#: ../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 "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4759,12 +4567,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "el parámetro ''{0}'' no debe ser nulo" +msgstr "parámetro ''{0}'' no debe estar vacío" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4772,15 +4580,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "no borrado" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "No implementado aún." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4789,17 +4597,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "desde la vía" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Borrar de la relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Conflictos en dato" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4823,41 +4628,91 @@ msgstr[1] "{0} relaciones" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Resolución de conflictos" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Resolver los conflictos" - -#: ../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 "Aplicar" - #: ../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 "Pegar" +msgstr "Pegar ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "From ..." -msgstr "" +msgstr "Desde ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "To ..." -msgstr "" +msgstr "A ..." #: ../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} iniciar" -msgstr[1] "{0} iniciar" +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 "Eliminar el miembro en la fila de tabla actual de esta relación" + +#: ../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 "lugar" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Pendiente" + +#. --- 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 "Clave:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Valor" + +#: ../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 "Sentido único" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisión" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4884,5 +4739,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}" @@ -4915,5 +4770,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." @@ -4987,13 +4842,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 "Capa: {0}" +msgstr "Vía {0}" #: ../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 "Relaciones: {0}" +msgstr "Relación {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5062,5 +4917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" -msgstr "" +msgstr "Información de capa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 @@ -5080,5 +4935,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 "" @@ -5138,5 +4993,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 "Añadir" @@ -5186,5 +5041,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 "Relaciones" @@ -5214,5 +5069,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412 msgid "Create a copy of this relation and open it in another editor window" -msgstr "" +msgstr "Crea una copia de esta relación y la abre en otra ventana de edición." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5279,9 +5134,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] "{0} Autor" +msgstr[1] "{0} Autores" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5290,20 +5145,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Mostrar" +msgstr "Mostrar info" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Más información sobre esta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} " -"de {1} solo seleccionados primitivos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5333,9 +5184,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" -msgstr "" +msgstr "Descargar todas las relaciones hijo (recursivamente)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" -msgstr "" +msgstr "Descargar Todos los Hijos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 @@ -5367,5 +5218,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 msgid "Relation is deleted" -msgstr "" +msgstr "La relación se ha borrado" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 @@ -5378,5 +5229,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}" @@ -5394,9 +5245,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 "" @@ -5624,5 +5470,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" -msgstr "" +msgstr "Ampliar a" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 @@ -5647,11 +5493,11 @@ msgstr "Vinculado" -#: ../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 "" @@ -5665,7 +5511,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Editar relaciones" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5793,5 +5638,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Lugares" @@ -5869,9 +5714,13 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: Rueda del ratón, doble clic or Ctrl + Up/Down Mover mapa: Mantenga el botón derecho pulsado y mueva el ratón o las teclas de " +"dirección. Seleccionar: Clic." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5901,17 +5750,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Historial para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Historial para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Historial para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5920,7 +5769,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Mostrando el historial de la primitiva seleccionada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5953,22 +5801,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Cargando historial para {0} con id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Cargando historial para {0} con id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Cargando historial para {0} con id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6803,52 +6651,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 "Nombre" @@ -6858,21 +6706,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 "Conjunto de cambios {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Más información sobre esta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Conjunto de cambios {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6890,12 +6736,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nombre de la calle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 msgid "Yes" -msgstr "Sí" +msgstr "Si" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6931,12 +6776,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Por favor, selecciona un valor" +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 "La capa ''{0}'' debe estar en la lista de capas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6981,6 +6825,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Arreglar conflictos de etiquetas" +msgid "Unsaved data and conflicts" +msgstr "Resolver los conflictos" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6997,5 +6841,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 "" @@ -7015,5 +6859,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 #, fuzzy -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "Ignorar el uso de etiquetas de archivos por defecto." @@ -7027,7 +6871,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Descartar y salir" +msgstr "Descartar y borrar" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7040,7 +6883,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Guardar y salir" +msgstr "Grabar y borrar" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7118,26 +6960,156 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Al envío" +msgstr "¿Debe subirse?" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 msgid "Should save?" -msgstr "" +msgstr "¿Debe grabarse?" #: ../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 "Usar un nuevo conjunto de cambio y cerrarlo" + +#: ../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 "Usar un nuevo conjunto de cambio y dejarlo abierto" + +#: ../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 "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "subir todos los cambios en una petición" + +#: ../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 "" +"Permitir subir todos los cambios en una petición, no permitir usar una " +"petición por cambio sencillo" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Preferencias" + +#: ../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 "Etiquetas del nuevo conjunto de cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Objetos que añadir:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objetos que modificar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objetos que eliminar:" + +#: ../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] "{0} objeto para añadir:" +msgstr[1] "{0} objetos para añadir:" + +#: ../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] "{0} objeto para modificar:" +msgstr[1] "{0} objetos para modificar:" + +#: ../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] "{0} objeto para eliminar:" +msgstr[1] "{0} objetos para eliminar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Usar el conjunto de cambios existente {0} y cerrarlo después de subir" + +#: ../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 "Etiquetas del conjunto de cambios {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Subir cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Archivo" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "¿Subir estos cambios?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Subiendo" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Por favor, introduzca un nombre para la localización." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "No hay primitivas seleccionadas para actualizar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7371,5 +7343,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." @@ -7427,7 +7398,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Descargando datos" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7493,4 +7463,13 @@ msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" + +#: ../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 "" +"La subida de datos gps sin procesar como datos de mapa se considera " +"peligroso.
Si quiere subir trazas, consulte aquí:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7646,5 +7625,5 @@ msgid "Setting Preference entries directly. Use with caution!" msgstr "" -"Establecer valores de preferencias manualmente. ¡Utilícelo con precaución!" +"Establece valores de preferencias manualmente. ¡Utilícelo con precaución!" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 @@ -7688,5 +7667,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 "Por favor, seleccione la fila a borrar" @@ -7831,5 +7810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115 msgid "Voice recorder calibration" -msgstr "Calibración grabador de voz" +msgstr "Calibración del grabador de voz" #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 @@ -8178,7 +8157,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Mostrar el ID del objeto en las listas de selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8193,7 +8171,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Mostrar el ID del objeto en las listas de selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8217,9 +8194,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40 msgid "Enable built-in defaults" -msgstr "Activar los valores por defecto internos" +msgstr "Activar los valores predefinidos por defecto" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36 msgid "Enable built-in icon defaults" -msgstr "" +msgstr "Activar los iconos predefinidos por defecto" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 @@ -8381,5 +8358,5 @@ #, java-format msgid "Short Description: {0}" -msgstr "Ordenar descripción: {0}" +msgstr "Descripción corta: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 @@ -8423,4 +8400,5 @@ msgid "The XML source (URL or filename) for {0} definition files." msgstr "" +"La fuente XML (URL o ruta del archivo) para loas archivos de definición {0}." #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274 @@ -8435,5 +8413,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281 msgid "Defaults (See tooltip for detailed information)" -msgstr "" +msgstr "Por defecto (Vea el texto emergente para información más detallada)" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38 @@ -8570,8 +8548,4 @@ msgstr "Desactivar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Clave:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8628,5 +8602,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 @@ -8637,42 +8611,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Añadir una nueva capa" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Borrar la capa seleccionada" - -#: ../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 "Más información sobre esta característica" #. 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 "Atributos opcionales" -#: ../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 "Usar preferencia ''{0}'' del grupo ''{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 "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "vía sin salida" -#: ../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 "Tipo desconocido: {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 @@ -8683,15 +8655,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {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 "Error analizando {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 "Los elementos del tipo {0} son soportados" -#: ../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 @@ -8701,18 +8673,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../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 "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -8739,5 +8711,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, Posiblemente faltan algunas etiquetas." @@ -8753,7 +8724,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 @@ -8831,5 +8799,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}" @@ -8837,5 +8805,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" @@ -8843,5 +8811,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" @@ -8864,6 +8831,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 @@ -8873,40 +8840,40 @@ msgstr "Descargando datos OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Editar la relación nº {0} en la capa \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8970,10 +8937,10 @@ msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}" -#: ../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 "" @@ -8981,46 +8948,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Abriendo conjunto de cambios..." - -#: ../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}" -msgstr "" +msgstr "Conjunto de cambios {0} abierto con éxito" #: ../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 "Abriendo conjunto de cambios..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Abriendo conjunto de cambios..." - -#: ../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 "Abriendo conjunto de cambios..." - -#: ../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 " @@ -9028,44 +8977,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../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 "Cerrando conjunto de cambios..." - -#: ../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 "Abriendo conjunto de cambios..." - -#: ../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 "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Subiendo..." -#: ../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 "OK - intentando de nuevo." -#: ../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}." @@ -9084,10 +9033,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 "Archivo comprimidos en bzip2 del Servidor OSM" -#: ../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 "Archivo bz2 inválido" @@ -9147,6 +9096,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 "Archivos del servidor OSM" @@ -9175,5 +9129,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 "" @@ -9242,79 +9196,154 @@ msgstr "Error durante el análisis sintáctico." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Versión desconocida" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Falta número de versión en los datos OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "atributo \"{0}\" obligatorio perdido" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "atributo \"{0}\" obligatorio perdido" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Versión desconocida: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "atributo \"{0}\" obligatorio perdido" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Encontrado elemento en una no Vía" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " no tiene ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Encontrada una etiqueta fuera de una relación." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" -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}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" msgstr "" "Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, " "valor {1}" -#: ../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}." +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" +msgstr "" +"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, " +"valor {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" +"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, " +"valor {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "" "Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor {2}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, " +"valor {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta sin 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Objeto con id=0 ilegal" -#: ../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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Valor no válido para el atributo \"version\" en la primitiva OSM con id {0}, " "valor {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Versión desconocida: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Falta el atributo necesario \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido " +"\"{1}\"" + +#: ../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 "" @@ -9323,16 +9352,32 @@ 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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "" +"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Preparando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "id del nodo mal formado" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Preparando datos OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Preparando datos..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9379,33 +9424,43 @@ "conexión a Internet." -#: ../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}), faltan {3}. Actualizando {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}), faltan {3}. Actualizando {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}), faltan {3}. Actualizando {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 "Subiendo..." + +#: ../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 "Nada que subir. Consigue algunos datos primero." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9444,12 +9499,7 @@ msgstr "Descargando complemento {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Saltar descarga" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "Versión de JOSM {0} requerida para el complemento {1}" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9461,4 +9511,9 @@ msgstr "Salta la descargar" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Versión de JOSM {0} requerida para el complemento {1}" + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9502,21 +9557,21 @@ #: ../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 "Deshabilitar complemento" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 -#, java-format -msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "" -"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Mantener componente" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#, java-format +msgid "Could not load plugin {0}. Delete from preferences?" +msgstr "" +"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -9526,5 +9581,9 @@ "permiso para escribir sobre los existentes" -#: ../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 "" @@ -9534,10 +9593,10 @@ "\"." -#: ../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 "De acuerdo a la información del componente, el autor es {0}." -#: ../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." @@ -9546,9 +9605,9 @@ "informar del error." -#: ../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 "¿Se debe deshabilitar el complemento?" -#: ../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 " @@ -9558,13 +9617,13 @@ "JOSM para descargarle del programa." -#: ../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 "Información del complemento" -#: ../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" @@ -9621,4 +9680,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 "desconocido" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9660,7 +9750,6 @@ "Ha ocurrido una excepción imprevista.\n" "\n" -"Este es siempre un error de código. Si usted esta ejecutando la última " -"versión\n" -"de JOSM, por favor, considere enviar un informe de error." +"Esto es siempre un error de código. Si usted esta ejecutando la última\n" +"versión de JOSM, por favor, considere enviar un informe de error." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 @@ -9692,4 +9781,102 @@ msgid "(The text has already been copied to your clipboard.)" msgstr "(El texto ya ha sido copiado a tu portapapeles.)" + +#: ../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 "" +" Subida al servidor fallida debido a que su actual " +"conjunto de datos
viola una condición previa.
El mensaje de error es:" +"
{0}" + +#: ../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 "" +"Fallo al abrir una conexión con el servidor remoto
''{0}''.
Por " +"favor, compruebe su conexión de Internet." + +#: ../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 "" +"El servidor OSM
''{0}''
informa de un error de servidor interno." +"
Esto suele ser un problema temporal. Inténtelo de nuevo más tarde, por " +"favor." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162 +#, java-format +msgid "The OSM server ''{0}'' reported a bad request.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165 +#, fuzzy +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 "" +"El tamaño máximo de bbox es de 0,25 y su solicitud fue demasiado grande. " +"Solicite un área más pequeña o utilice planet.osm" + +#: ../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 "" +" Subida falladadebido a que ha intentado eliminar " +"una primitiva
en el servidor la cual ya está eliminada.
El mensaje " +"de error es:
{0} " #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 @@ -9762,5 +9949,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9769,5 +9956,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9776,5 +9963,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9783,5 +9970,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9790,5 +9977,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9849,40 +10036,39 @@ msgstr "Subir trazas" -#: ../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 (EN)" - -#: ../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 "Descripción" -#: ../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 "Por favor, introduzca la descripción sobre su traza" -#: ../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 "Por favor, introduzca una etiqueta sobre su traza" -#: ../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}" @@ -9890,48 +10076,48 @@ #. 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 "Conectando..." -#: ../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 "Subida cancelada" -#: ../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 "Error al actualizar" -#: ../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 "GPX subido correctamente" -#: ../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 "Subida fallida. El servidor retorna el siguiente mensaje " -#: ../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 "Subiendo traza GPX: {0}% ({1} de {2})" -#: ../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 "" "Ninguna descripción facilitada. Por favor, proporcione alguna descripción." -#: ../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 "No hay ninguna capa gpx seleccionada. No se puede subir la traza." -#: ../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 "Ningún nombre de usuario facilitado." -#: ../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 "Ninguna contraseña facilitada." -#: ../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 "Subiendo traza GPX" @@ -10151,5 +10337,5 @@ msgstr "Fotos no etiquetadas todavía" -#: ../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 "Correlacionar las imágenes con la traza GPX" @@ -10163,13 +10349,13 @@ msgstr "Estimación automática" -#: ../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 "Debe seleccionar una traza GPX" -#: ../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 "No se ha seleccionado una traza GPX" -#: ../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 "" @@ -10180,9 +10366,9 @@ "Formato esperado: {0}" -#: ../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 "Zona horaria no válida" -#: ../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 "" @@ -10193,18 +10379,18 @@ "Formato esperado: {0}" -#: ../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 "Desplazamiento inválido" -#: ../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 "Encontrado {0} coincidencias de{1} en la traza GPX {2}" -#: ../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 "Traza GPX cargada" -#: ../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 "" @@ -10212,9 +10398,9 @@ "fueron tomadas." -#: ../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 "Las fotografías no contiene información horaria" -#: ../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." @@ -10223,39 +10409,39 @@ "seleccione otra." -#: ../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 "La traza GPX no posee información horaria" -#: ../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 "Zona horaria: {0}" -#: ../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 "Minutos: {0}" -#: ../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 "Segundos: {0}" -#: ../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 "Ajustadas al track GPS {0} de {1} fotografías" -#: ../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 "(Diferencia horaria de {0} días)" -#: ../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 "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" -#: ../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 " @@ -10263,13 +10449,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 "Ajuste de fotografías a traza fallido" -#: ../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 "Ajustar zona horaria y la diferencia temporal" -#: ../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 "Valores por defecto" @@ -10307,5 +10493,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 "Error al leer el archivo" @@ -10334,11 +10520,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Pueblo/ciudad {0} no hallado o disponible en WMS.\n" -"Por favor verifica su disponibilidad en www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10354,13 +10538,13 @@ msgstr "Elegir desde..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../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" @@ -10369,13 +10553,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 "JOSM está detenido para que el cambio surta efecto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10505,9 +10689,9 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Etiquetado automático de la fuente añadida:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?" @@ -10618,7 +10802,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "cargando imagen..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10664,7 +10847,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Seleccionar" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10754,7 +10936,7 @@ #: ../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 "Capa en blanco" +msgstr "Capa vacía" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 @@ -11707,18 +11889,18 @@ msgstr "Estado de la cuestión desconocida" -#: ../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 "Abrir visible..." -#: ../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 "Abrir solo archivos que sean visibles en la vista actual." -#: ../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 "No hay una vista abierta - No se pueden determinar los límites!" -#: ../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}" @@ -11729,5 +11911,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11737,9 +11919,9 @@ "pestaña Configuraciones del Mapa del menú Preferencias." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "Opciones de osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Ejecutable Firefox" @@ -11750,29 +11932,34 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Crear un nodo nuevo." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "cambiar la selección" -#: ../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 "modificar vista general" -#: ../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 "confirmar todas las acciones manuales de control remoto" -#: ../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 "" "Un componente que permite a JOSM ser controlado por otras aplicaciones." -#: ../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 "Control Remoto" -#: ../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 "Ajustes para el componente Control Remoto" -#: ../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 " @@ -11784,28 +11971,35 @@ "comunicarse con el complemento." -#: ../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 "Acciones permitidas" -#: ../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 "El control remoto ha pedido cagar datos desde el API." -#: ../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 "Detalles requeridos: {0}" -#: ../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 "¿Desea permitir esto?" -#: ../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 "confirmar la acción del control remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "El control remoto ha pedido cagar datos desde el API." + +#: ../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 "El control remoto ha pedido importar datos de la siguiente URL:" @@ -12307,25 +12501,33 @@ "favor, compruebe los errores no se han introducido." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Introduzca valores para todos los conflictos." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Resolver conflictos" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Arreglar conflictos de etiquetas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Eliminar elementos de las relaciones" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Fusionar áreas: eliminar las vías cortas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Vía cerrada" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de vías internas" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Función para la fusión de áreas" @@ -12402,6 +12604,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 "Validación de errores" @@ -12411,10 +12613,10 @@ msgstr "Sin validación de errores" -#: ../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 "Rejilla" -#: ../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 "" @@ -12507,51 +12709,65 @@ msgstr "Realiza la validadción de datos" -#: ../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 "Datos con errores. ¿Aún así desea subirlos al servidor?" -#: ../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 "Abrir la ventana de validación" -#: ../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 "Zoom al problema" -#: ../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 "Corregir" -#: ../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 "Corregir los errores seleccionados" -#: ../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 "Ignorar" -#: ../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 "Ignorar los errores selecionados la próxima vez." -#: ../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 "Todo el grupo" -#: ../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 "Solo los elementos" -#: ../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 "Ninguno" -#: ../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 "¿Ignorar todo el grupo o los elementos individuales?" -#: ../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 "Ignorando elementos" + +#: ../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 "Actualizando datosd" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12577,16 +12793,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Este test comprueba si dos carreteras, vías de tren o vías fluiviales se " -"cruzan al mismo nivel, sin estar conectadas por algún nodo." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Crear edificios" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12594,19 +12806,18 @@ msgstr "Cruce de vías" -#: ../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 "Nodos duplicados" -#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Nodos con el mismo nombre" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Confirmación" @@ -12614,19 +12825,16 @@ #: ../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 "Duplicar vía" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Esta examen comprueba que no haya nodos en el mismo lugar." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Crear un duplicado de la vía" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13217,5 +13425,5 @@ msgstr "Alcanzar una intersección" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Ocurrió una excepción" @@ -13299,5 +13507,5 @@ msgstr "Añadir imágen rectificada" -#: ../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 " @@ -13305,5 +13513,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 "URL o id de WMS no válida" @@ -13321,17 +13529,17 @@ msgstr "Por favor, selecciona la capa WMS a ajustar." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "Seleccionar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Inicio de ajuste" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "No existe alctualmente ningua capa WMS que ajustar." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "Ninguna capa que ajustar" @@ -13375,19 +13583,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Activar" - -#: ../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 "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../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 "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13397,15 +13604,18 @@ "tiles anyway?" msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +"La URL base
''{0}''
para esta capa WML no finaliza con un ''&'' " +"ni con un ''?''.
Esto puede dar lugar a una solicitud WMS no válida. " +"Debes comprobar la
configuración de tus preferencias.
¿Quieres " +"descargar las teselas WMS de todos modos?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 -#, fuzzy +msgstr "Sí, descargar las imágenes" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Fecha no válida" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13414,58 +13624,58 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Abrir una capa WMS en blanco para cargar datos desde un archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Preferencias del componente WMS" -#: ../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 "" @@ -13476,45 +13686,56 @@ "para añadirlo a la lista superior de servidores mostrados)" -#: ../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 "Nombre del menú" -#: ../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 "Dirección URL del servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Nombre del menú (por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "Dirección URL del servicio WMS (Por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Introduce un nombre y una dirección para el servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Copiar predeterminados" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Por favor seleccione por lo menos una vía." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Gestor de descarga:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Teselas superpuestas" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% de lat:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% de lat:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "Archivos TCX (*.tcx)" +msgstr "" #. * @@ -13938,5 +14159,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 "Referencia" @@ -14478,7 +14699,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Chalet" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14499,8 +14719,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 "Alquiler" +msgstr "" #. color heath @@ -14518,5 +14737,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 "bosque" @@ -14529,7 +14749,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "billetes de aparcamiento" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14565,7 +14784,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "adoquinado" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14576,7 +14794,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incompleto" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14587,7 +14804,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "hierba" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14781,4 +14997,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" @@ -14807,12 +15024,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 "sí" #. color permissive -#. +#. #. 1 #. 40000 @@ -14860,5 +15077,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14895,5 +15112,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14957,6 +15174,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 "no" @@ -15102,6 +15320,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 "Tipo" @@ -15372,7 +15590,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Calle peatonal" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15391,7 +15608,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pinchos" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15684,7 +15900,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 "Operador" @@ -15897,6 +16113,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 "Altitud" @@ -16808,7 +17024,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" @@ -16856,23 +17069,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 "Horario de apertura" @@ -16896,5 +17109,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" @@ -16941,22 +17153,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 "" @@ -16971,22 +17183,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 "" @@ -17001,22 +17213,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 "" @@ -17050,5 +17262,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 "Número de referencia" @@ -17068,7 +17280,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "estacionamientos Park and Ride" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -17082,7 +17293,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Capacidad (Coches)" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -17092,12 +17302,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Plazas para Personas de Movilidad Reducida" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Plazas para Personas de Movilidad Reducida" +msgstr "" #: build/trans_presets.java:1400 @@ -17299,5 +17507,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Refugio" @@ -17682,7 +17890,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17725,28 +17932,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chino" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Descargar área" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Pegar" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Ciudad (>100.000 hab.)" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regional" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17774,7 +17976,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Sendero de montaña" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17788,7 +17989,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "vía muerta" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17805,13 +18005,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Aduana" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "novato" +msgstr "" #: build/trans_presets.java:1737 @@ -17828,42 +18026,36 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "uso del suelo" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Hito direccional (excursionismo)" +msgstr "Poste indicador" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Información" +msgstr "Punto de información" #. 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 "Descripción detallada" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "Audioguía" #. #: build/trans_presets.java:1775 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "¿Audioguía a través de telefono móvil?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Número de teléfono" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18187,5 +18379,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18219,5 +18411,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19343,6 +19535,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 "Religión" @@ -19351,66 +19543,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 "bahaísta" -#: 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 "budista" -#: 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 "cristiana" -#: 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 "hindú" -#: 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 "jainista" -#: 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 "judía" -#: 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 "musulmana" -#: 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 "sijista" -#: 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 "espiritualista" -#: 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 "taoista" -#: 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 "unitarismo" -#: 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 "zoroástrica" -#: 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 "Confesión" @@ -19419,76 +19611,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 "anglicano" -#: 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 "baptista" -#: 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 "católico" -#: 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 "evangélico" -#: 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 "testigos de Jehová" -#: 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 "luterano" -#: 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 "metodista" -#: 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 "mormón" -#: 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 "ortodoxo" -#: 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 "pentecostal" -#: 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 "presbiteriano" -#: 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 "protestante" -#: 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 "cuáquero" -#: 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 "chiita" -#: 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 "suní" @@ -19820,5 +20012,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 "Nota" @@ -19843,5 +20035,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 "Monedas" @@ -19849,5 +20041,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 "Billetes" @@ -19855,5 +20047,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 "Tarjetas de recarga y monederos electrónicos" @@ -19861,5 +20053,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 "Tarjetas de débito" @@ -19867,5 +20059,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 "Tarjetas de crédito" @@ -19924,10 +20116,144 @@ msgstr "Banco" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Retroceder" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Monumento conmemorativo" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "ninguno" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "lugar" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Color" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Retroceder" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "abajo" + +#. 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 "zona verde" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "fin" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valor" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "lámina de agua" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Número de cables" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Apostadero de caza" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Editar apostadero de caza" @@ -19936,30 +20262,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 "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "profundidad" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "media" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "total" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Oculto" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Esclusa" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fuente" @@ -19968,10 +20294,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Editar fuente" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Agua potable" @@ -19980,10 +20306,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Editar agua potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Caja tibia" @@ -19991,35 +20317,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Editar caja tibia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Tiendas" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermercado" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Editar supermercado" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Chalet" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "Farmacia" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Editar chalet" - -#: build/trans_presets.java:2478 +msgstr "Editar farmacia" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Tienda de alimentación" @@ -20027,39 +20351,37 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Editar tienda de alimentación" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" -msgstr "Kiosko" +msgstr "Kiosco" #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" -msgstr "Editar kiosko" - -#: build/trans_presets.java:2492 +msgstr "Editar kiosco" + +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "Librería" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Editar parada de autobús" - -#: build/trans_presets.java:2498 +msgstr "Editar librería" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "Agencia de viajes" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Editar árbol" - -#: build/trans_presets.java:2504 +msgstr "Editar agencia de viajes" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Máquina expendedora" @@ -20067,5 +20389,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -20073,88 +20395,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "billetes de de transporte público" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "abonos de transporte público" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "billetes de aparcamiento" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "Caramelos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "comida para animales" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "Periódicos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "juguetes" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "sellos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "Tarjetas SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "Tarjetas telefónicas" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "condones" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampones" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Tarjetas de fidelización o descuento" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Carnicería" @@ -20162,9 +20484,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Editar carnicería" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Panadería" @@ -20172,9 +20494,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Editar panadería" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Floristería" @@ -20182,18 +20504,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Editar floristería" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Tienda de productos orgánicos" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Editar tienda de productos orgánicos" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Tienda de bebidas alcohólicas" @@ -20201,54 +20523,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Editar tienda de bebidas alcohólicas" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Bebidas" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Editar tienda de bebidas" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" -msgstr "Computador" - -#. item -#: build/trans_presets.java:2560 +msgstr "Tienda de informática" + +#. item +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" -msgstr "Editar tienda de computadores" - -#: build/trans_presets.java:2565 +msgstr "Editar tienda de informática" + +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Electrónica" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Editar tienda de electrónica" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Editar Tienda Hifi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Muebles" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Editar mueblería" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Centro de jardinería" @@ -20256,9 +20578,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Editar centro de jardinería" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Hardware" @@ -20266,9 +20588,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Editar almacén de hardware" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaje" @@ -20276,54 +20598,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaje" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Papelería" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Peluquería" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Editar peluquería" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Zapatos" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Juguetes" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Editar juguetería" -#: 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 "Editar tienda de videos" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Tintorería" @@ -20331,9 +20653,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Lavandería" @@ -20341,9 +20663,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Editar lavandería" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Tienda de actividades al aire libre" @@ -20351,32 +20673,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Editar tienda de actividades al aire libre" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Deportes" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Editar tienda de material de deportes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Óptica" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Editar óptica" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Dinero en efectivo" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banco" @@ -20384,14 +20706,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Editar banco" -#: 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 "Cajero automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Cambio de moneda" @@ -20399,5 +20721,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Editar cambio de moneda" @@ -20405,15 +20727,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Editar cajero automático" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Centro médico" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Médico" @@ -20421,18 +20743,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Editar médico" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Editar dentista" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Farmacia/Parafarmacia" @@ -20440,5 +20762,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Editar farmacia/parafarmacia" @@ -20446,9 +20768,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Expende con receta médica" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hospital" @@ -20456,10 +20778,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Punto de acceso para emergencias" @@ -20468,5 +20790,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emergencias" @@ -20475,20 +20797,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Número de punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Nombre del Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Número de teléfono" #. 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 "(Utilizar código internacional, como +12-345-67890)" @@ -20496,5 +20818,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 "Veterinario" @@ -20503,55 +20825,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Editar veterinario" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Editar continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "País" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Editar país" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Estado/Provincia" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Editar estado/provincia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Región" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Editar región" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Municipio" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Editar municipio" @@ -20559,15 +20881,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Ciudad (>100.000 hab.)" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Editar ciudad (>100.00 hab.)" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Ciudad (10.000 - 100.000 hab.)" @@ -20575,10 +20897,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Editar ciudad (10.000 - 100.000 hab.)" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "" @@ -20588,5 +20910,5 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "" @@ -20595,15 +20917,15 @@ #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Población (< 10.000 hab.)" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Editar población (< 10.000 hab.)" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" @@ -20611,5 +20933,5 @@ #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -20619,5 +20941,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Paraje" @@ -20625,10 +20947,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Editar paraje" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Isla" @@ -20636,24 +20958,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Editar isla" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "Izquierda" +msgstr "Islote" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Editar chalet" +msgstr "Editar islote" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Entrada de cueva" @@ -20661,10 +20981,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Editar entrada de cueva" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Pico" @@ -20672,10 +20992,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Editar pico" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Glaciar" @@ -20683,10 +21003,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Volcán" @@ -20694,70 +21014,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Fronteras" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nacional" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Editar frontera nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrativa" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Editar frontera administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Editar frontera civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Político" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Editar frontera política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Parque Nacional" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Editar límites del parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Uso del suelo" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Árbol" @@ -20766,15 +21086,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Editar árbol" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Nombre botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Bosque" @@ -20783,5 +21103,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Editar bosque" @@ -20789,17 +21109,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 "conífera" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "caducifolio" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Plantación forestal" @@ -20808,14 +21128,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Reserva natural" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Editar reserva natural" @@ -20823,25 +21143,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Pedregal" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Editar pedregal" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Matorral" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Braña" @@ -20849,10 +21169,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Editar braña" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Brezal o landa" @@ -20860,5 +21180,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -20866,5 +21186,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Edificio agrario" @@ -20873,45 +21193,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Tierra de labranza" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Editar tierra de labranza" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Prado" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Editar prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Viñedo" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Editar viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Huertos de ocio" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Editar zona de huertos de ocio" @@ -20919,25 +21239,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Jardín" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Editar jardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Pastizal" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Editar pastizal" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Parque municipal" @@ -20945,10 +21265,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" @@ -20956,20 +21276,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Editar espacio de uso común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Parque" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Área de esparcimiento" @@ -20977,5 +21297,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Editar área de esparcimiento" @@ -20983,15 +21303,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Área residencial" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Editar suelo residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Cementario" @@ -20999,9 +21319,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Editar cementerio" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cementerio" @@ -21009,39 +21329,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Editar cementerio" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Comercios" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Oficinas" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Editar oficinas" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Editar suelo industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Zona ferroviaria" @@ -21049,15 +21369,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Editar zona ferroviaria" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militar" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Editar área militar" @@ -21065,55 +21385,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Zona en construcción" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Editar zona en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Baldío" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Editar terreno baldío" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Suelo en construcción" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Editar suelo en contrucción" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Vertedero" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Editar vertedero" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Cantera" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Editar cantera" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolígono" @@ -21123,5 +21443,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 "Editar multipolígono" @@ -21130,10 +21450,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "segmento exterior" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "segmento interior" @@ -21141,5 +21461,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Restricción de giro" @@ -21148,5 +21468,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Editar restricción de giro" @@ -21154,34 +21474,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "prohibido girar a la izquierda" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "prohibido girar a la derecha" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "prohibido continuar recto" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "prohibido giro en U" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "solo giro a la derecha" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "solo giro a la izquierda" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "solo recto" @@ -21190,15 +21510,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "desde la vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "a través de nodo o vía" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "a la vía" @@ -21206,5 +21526,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Ruta" @@ -21213,5 +21533,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Editar ruta" @@ -21219,5 +21539,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Tipo de ruta" @@ -21225,5 +21545,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21289,5 +21609,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 @@ -21296,17 +21616,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "carretera" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ski" @@ -21359,5 +21679,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 @@ -21366,13 +21686,13 @@ msgstr "pie" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "senderismo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "desvío" @@ -21386,10 +21706,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Descripción del símbolo" @@ -21397,31 +21717,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Red" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "Route state" msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "proposed" msgstr "Propuesto" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "Suplente" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "Conexión" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Color (hex)" @@ -21430,30 +21750,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "segmento de la ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "segmento siguiente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "anterior punto de parada" @@ -24606,76 +24926,4 @@ msgstr "patrimonio histórico" -#. 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 "zona verde" - #. color green #. @@ -25496,5 +25744,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "autopista sin clasificar sin nombre" +msgstr "Carretera sin clasificar sin nombre" #. way : W : highway == unclassified && name != * @@ -25643,172 +25891,112 @@ msgstr "Terraserver Urban" +#. 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 "Todas la vías están vacías" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "¿Unir nodos con diferentes relaciones?" + +#~ msgid "Merge Anyway" +#~ msgstr "Unir de todos modos" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que " +#~ "quiere unirlos?" + +#~ msgid "Unknown version" +#~ msgstr "Versión desconocida" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Falta número de versión en los datos OSM" + +#~ msgid "Found element in non-way." +#~ msgstr "Encontrado elemento en una no Vía" + +#~ msgid " has zero ref" +#~ msgstr " no tiene ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Encontrada una etiqueta fuera de una relación." + +#~ msgid "Ill-formed node id" +#~ msgstr "id del nodo mal formado" + +#~ msgid "Move" +#~ msgstr "Mover" + +#~ msgid "Unknown file extension." +#~ msgstr "Extensión de archivo desconocida." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ningún documento abierto luego nada por grabar." + +#~ msgid "Email" +#~ msgstr "Correo Electrónico" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolver conflictos" + +#~ msgid "There were conflicts during import." +#~ msgstr "Existieron conflictos durante la importación" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "No se puede abrir el directorio de preferencias: {0}" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactando con el servidor OSM..." + +#~ msgid "their version:" +#~ msgstr "su versión:" + +#~ msgid "resolved version:" +#~ msgstr "versión resuelta:" + +#~ msgid "my version:" +#~ msgstr "mi versión:" + +#~ msgid "Object" +#~ msgstr "Objeto" + +#~ msgid "position" +#~ msgstr "posición" + +#~ msgid "different" +#~ msgstr "diferente" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "true" +#~ msgstr "verdadero" + +#~ msgid "unnamed" +#~ msgstr "sin nombre" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Validar nombre (correo-e) de la cuenta OSM" + +#~ msgid "Aborting..." +#~ msgstr "Abortando..." + +#~ msgid "Change" +#~ msgstr "Modificar" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" #~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:" -#~ "{0}" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. " -#~ "Por favor comunique esto como fallo." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Ningún documento abierto luego nada por grabar." - -#~ msgid "Change {0} {1}" -#~ msgstr "Cambiar {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Borrar {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Eliminando miembro de relación {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "No se puede abrir el directorio de preferencias: {0}" - -#~ msgid "nodes" -#~ msgstr "nodos" - -#~ msgid "ways" -#~ msgstr "vías" - -#~ msgid "relations" -#~ msgstr "relaciones" - -#~ msgid "changesets" -#~ msgstr "conjuntos de cambios" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Fallo al cargar el historial desde el servidor. Detalles:
{0}" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas " -#~ "formas?" - -#~ msgid "Delete Layer" -#~ msgstr "Eliminar capa" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Borrar todo" - -#~ msgid "Authors: {0}" -#~ msgstr "Autores: {0}" - -#~ msgid "Public" -#~ msgstr "Público" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Se ha seleccionado hacer públicas sus trazas GPS en openstreetmap.org" - -#~ msgid "Set Lambert coordinate" -#~ msgstr "Fijar coordenada Lambert" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo " -#~ "al servidor." - -#~ msgid "Continue anyway" -#~ msgstr "Continuar de todos modos" - -#~ msgid "Copy Default" -#~ msgstr "Copiar por defecto" - -#~ msgid "Edit Information Office" -#~ msgstr "Editar oficina de información" - -#~ msgid "Map Type" -#~ msgstr "Tipo de Mapa" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "citymap" -#~ msgstr "callejero" - -#~ msgid "hikingmap" -#~ msgstr "topoguía" - -#~ msgid "bicyclemap" -#~ msgstr "mapa ciclable" - -#~ msgid "Board Type" -#~ msgstr "Tipo de Cartel" - -#~ msgid "board" -#~ msgstr "cartel" - -#~ msgid "Move" -#~ msgstr "Mover" - -#~ msgid "Unknown file extension." -#~ msgstr "Extensión de archivo desconocida." - -#~ msgid "Email" -#~ msgstr "Correo Electrónico" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolver conflictos" - -#~ msgid "There were conflicts during import." -#~ msgstr "Existieron conflictos durante la importación" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contactando con el servidor OSM..." - -#~ msgid "their version:" -#~ msgstr "su versión:" - -#~ msgid "resolved version:" -#~ msgstr "versión resuelta:" - -#~ msgid "my version:" -#~ msgstr "mi versión:" - -#~ msgid "Object" -#~ msgstr "Objeto" - -#~ msgid "position" -#~ msgstr "posición" - -#~ msgid "different" -#~ msgstr "diferente" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "true" -#~ msgstr "verdadero" - -#~ msgid "unnamed" -#~ msgstr "sin nombre" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Validar nombre (correo-e) de la cuenta OSM" - -#~ msgid "Aborting..." -#~ msgstr "Abortando..." - -#~ msgid "Change" -#~ msgstr "Modificar" #~ msgid "OSM username (email)" @@ -25844,4 +26032,19 @@ #~ msgstr "Resolver conflictos {0} en objetos {1}" +#~ msgid "Delete {1} {0}" +#~ msgstr "Borrar {1} {0}" + +#~ msgid "hikingmap" +#~ msgstr "topoguía" + +#~ msgid "citymap" +#~ msgstr "callejero" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "bicyclemap" +#~ msgstr "mapa ciclable" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -25909,4 +26112,15 @@ #~ msgstr "Algunos nodos están (casi) en la línea" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. " +#~ "Por favor comunique esto como fallo." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" @@ -25944,6 +26158,6 @@ #~ msgstr "Ajustar la posición de la capa WMS" -#~ msgid "end" -#~ msgstr "fin" +#~ msgid "Copy Default" +#~ msgstr "Copiar por defecto" #~ msgid "Really mark this issue as ''done''?" @@ -25992,4 +26206,7 @@ #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS" + +#~ msgid "board" +#~ msgstr "cartel" #~ msgid "" @@ -26024,4 +26241,7 @@ #~ "{0}" +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + #~ msgid "Layers: {0}" #~ msgstr "Capas: {0}" @@ -26033,4 +26253,7 @@ #~ msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática" +#~ msgid "Public" +#~ msgstr "Público" + #~ msgid "viaduct" #~ msgstr "viaducto" @@ -26045,6 +26268,12 @@ #~ msgstr "Básico" +#~ msgid "Delete Layer" +#~ msgstr "Eliminar capa" + #~ msgid "Delete and Download" #~ msgstr "Eliminar y descargar" + +#~ msgid "Continue anyway" +#~ msgstr "Continuar de todos modos" #~ msgid "Move Down" @@ -26066,4 +26295,13 @@ #~ msgid "No intersections found. Nothing was changed." #~ msgstr "Ninguna intersección encontrada. No se han producido cambios." + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Se ha seleccionado hacer públicas sus trazas GPS en openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo " +#~ "al servidor." #~ msgid "rectifier id={0}" @@ -26154,6 +26392,15 @@ #~ msgstr "Cambia la proyección a {0} previamente." +#~ msgid "Map Type" +#~ msgstr "Tipo de Mapa" + +#~ msgid "Board Type" +#~ msgstr "Tipo de Cartel" + #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Edit Information Office" +#~ msgstr "Editar oficina de información" #~ msgid "" @@ -26195,7 +26442,4 @@ #~ msgid "Cannot read numeric value from response" #~ msgstr "No se puede leer el valor numérico de la respuesta" - -#~ msgid "% of lat:" -#~ msgstr "% de lat:" #~ msgid "% of lon:" @@ -26226,7 +26470,4 @@ #~ msgstr "La subida de datos ha fallado por una razón desconocida" -#~ msgid "Overlap tiles" -#~ msgstr "Teselas superpuestas" - #~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " @@ -26297,4 +26538,13 @@ #~ "de {1} primitivos." +#~ msgid "relations" +#~ msgstr "relaciones" + +#~ msgid "nodes" +#~ msgstr "nodos" + +#~ msgid "ways" +#~ msgstr "vías" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "" @@ -26308,10 +26558,10 @@ #~ msgstr "Capa de datos" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Eliminar el miembro en la fila de tabla actual de esta relación" - #~ msgid "Validate either current selection or complete dataset." #~ msgstr "Validar la selección actual o el conjunto de datos completado" +#~ msgid "Change {0} {1}" +#~ msgstr "Cambiar {0} {1}" + #~ msgid "WGS84 Geographisch" #~ msgstr "WGS84 Geográfico" @@ -26329,7 +26579,38 @@ #~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)" +#~ msgid "changesets" +#~ msgstr "conjuntos de cambios" + #~ msgid "No data" #~ msgstr "Sin datos" +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Eliminando miembro de relación {0} {1}" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Fallo al cargar el historial desde el servidor. Detalles:
{0}" + #~ msgid "Conflict created" #~ msgstr "Conflicto creado" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Fijar coordenada Lambert" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:" +#~ "{0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas " +#~ "formas?" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Borrar todo" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 17594) +++ /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." Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 17594) +++ /applications/editors/josm/i18n/po/fi.po (revision 17595) @@ -8,7 +8,7 @@ "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-30 22:10+0000\n" -"Last-Translator: Krisu \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-07 23:07+0000\n" +"Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\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:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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 "Ohje" -#: ../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 "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria" -#: ../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 "Virhe" -#: ../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] "Tallentamattomia muutoksia. Hylätäänkö muutokset?" -msgstr[1] "Tallentamattomia muutoksia. Hylätäänkö muutokset?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Tallentamattomia muutoksia" -#: ../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 "Tallenna ja poistu" -#: ../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 "Poistu tallentamatta" -#: ../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 "Peruuta" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{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 "Varoitus" -#: ../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 "Jätetään huomioimatta virheellinen URL-osoite: ”{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 "Liitännäiset" @@ -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 "Tiedot" @@ -548,5 +550,5 @@ msgstr "Valitse ainakin kolme pistettä." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -557,10 +559,10 @@ "enimmäismäärä on {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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -569,5 +571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -576,9 +578,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -633,75 +635,59 @@ msgstr "Ei ristiriitoja" -#: ../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 "Yhdistä polkuja" -#: ../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 "Yhdistää monta polkua yhdeksi." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Yhdistä silti" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " +"ne?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Vaihdetaanko suuntia?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Käännä ja yhdistä" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" + +#: ../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 "" +"Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Yhdistä {0} polkua" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Yhdistä silti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " -"ne?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Vaihdetaanko suuntia?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Käännä ja yhdistä" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" - -#: ../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 "Syötä arvot kaikille ristiriidoille." - -#: ../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 "Ratkaise ristiriitoja" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Yhdistä {0} polkua" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Kaikki polut olivat tyhjiä" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -730,5 +716,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "Valituista pisteistä ei voi muodostaa ympyrää." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -756,5 +742,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 "Poista" @@ -764,15 +750,15 @@ msgstr "Poista valitut objektit." -#: ../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 "Korvaa" -#: ../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 "Tiedosto on jo olemassa. Korvataanko?" @@ -801,10 +787,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}" @@ -835,5 +821,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 @@ -876,7 +862,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Kaikki kuvat" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1011,1046 +996,25 @@ msgstr "Liitä nykyinen taso toiseen tasoon" -#: ../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 "Yhdistä pisteet" -#: ../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 "Yhdistää pisteet vanhimpaan." -#: ../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 "Valitse vähintään kaksi yhdistettävää pistettä." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Yhdistä silti" - -#: ../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 "" -"Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " -"ne?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Yhdistä {0} pistettä" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Liitä valinta" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Peilaa" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Peilaa valitut pisteet ja polut" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Valitse ainakin yksi solmu tai tie" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "ylös" - -#: ../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 "Siirrä objektit {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "alas" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "vasen" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "oikea" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Siirrä {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Siirtää objektit {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 "Objekteja ei voi siirtää maailman ulkopuolelle" - -#: ../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 "Uusi" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Luo uusi kartta." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Avaa..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Avaa tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Avaa tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Tuntematon rooli \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Avaa sijainti..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Avaa URL-osoite." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Erota taso" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Anna ladattavan alueen URL-osoite:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Latauksen sijainti" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Lataa URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Suorakulmaista muoto" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Vain kaksi pistettä sallittu" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Valinnan pitää muodostua pelkistä poluista." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." - -#: ../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 "Vain yksi piste valittuna" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Suorakulmaista" - -#: ../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 "Liitä" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Liitä leikepöydän sisältö" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Liitä tagit" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Liitä valituille kohteille avain/arvo-parit leikepöydältä." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Ladataan {0}" -msgstr[1] "Ladataan {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, 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 "Asetukset..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Muokkaa JOSM:n asetuksia." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Asetukset" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Toista" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Toista edellinen kumottu toiminto" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Nimeä taso uudelleen" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Nimeä myös tiedosto uudelleen" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Käännä polut" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Kääntää valittujen polkujen suunnan." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Valitse ainakin yksi polku." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Käännä polut" - -#: ../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 "Tallenna" - -#: ../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 "Tallenna tämänhetkinen data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?" - -#: ../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 "Tyhjä dokumentti" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokumentti ei sisällä tietoa" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Tallenna silti" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Ristiriidat" - -#: ../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 "" -"Et ole ratkaissut ristiriitoja. Vain omat versiosi tallennetaan, ei tietoa " -"ristiriidoista. Jatka tallennusta?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Hylkää ristiriidat ja tallenna" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Tallenna OSM-tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Tallenna GPX-tiedosto" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Tallenna kerros" - -#: ../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 "Tallenna nimellä..." - -#: ../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 "Tallenna data uuteen tiedostoon." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Valitse kaikki" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Valitse tason kaikki palautetut objektit. Tämä valitsee myös keskeneräiset " -"objektit." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Näytä raportti" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Raportti" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopioi leikepöydälle ja sulje" - -#: ../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 "Sulje" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Katkaise polku" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Katkaisee polun valitun pisteen kohdalta." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Valintaa ei voida käyttää jakamiseen." - -#: ../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] "Valittu piste ei ole minkään polun keskellä." -msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua." - -#: ../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] "" -"Useampi kuin yksi polku kulkee valitun pisteen kautta. Ole hyvä ja valitse " -"myös polku jonka haluat katkaista." -msgstr[1] "" -"Useampi kuin yksi polku kulkee valittujen pisteiden kautta. Ole hyvä ja " -"valitse myös polku jonka haluat katkaista." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Valitut pisteet eivät ole samalla polulla." - -#: ../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] "Valittu polku ei sisällä valittua pistettä." -msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä." - -#: ../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 "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi." - -#: ../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 "" -"Polkua ei voida katkaista valittujen pisteiden kohdalta. (Vihje: Valitse " -"pisteitä, jotka eivät ole polun päissä.)" - -#: ../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 "Katkaise polku {0} {1} osaksi" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Suljetaan muutoskokoelma..." - -#: ../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 "Suljetaan muutoskokoelma..." - -#: ../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 "Luodaan muutoskokoelma..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Suljetaan muutoskokoelma..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Näytä/piilota GPX-viivat" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Piirrä viivat GPS-pisteiden välille." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Vaihda asetuksen \"{0}\" tila" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Erota polut" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Monistaa pisteet, jotka ovat monen polun käytössä." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Valitse joko:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Yksi piste jolla on tageja, tai" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Yksi piste, joka on useamman polun käytössä, tai" - -#: ../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 "" -"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" - -#: ../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 "" -"* Yksi polku, jossa on yksi tai useampi piste, jotka ovat myös muiden " -"polkujen käytössä, tai" - -#: ../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 "" -"* Yksi polku ja yksi tai useampi sen pisteistä, jotka ovat useamman polun " -"käytössä." - -#: ../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 "" -"Huomio: Jos valittuna on polku, se saa uudet kopiot monistetuista\n" -"pisteistä ja uudet pisteet tulevat valituiksi. Muussa tapauksessa\n" -"kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Irroitettu piste" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Monista {0} pisteeksi" - -#. 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 "Monista {0} pistettä {1} pisteeksi" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Kumoa" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Peru viimeisin toiminto." - -#: ../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 "Poista valinta" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Poista valinta kaikista objekteista." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta." - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Lähetä OSM-palvelimelle..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." - -#: ../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 "" -"Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Ei mitään lähetettävää. Hae ensin dataa." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Ei lähetettäviä muutoksia." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Lähetetäänkö nämä muutokset?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Lähetä muutokset" - -#: ../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 "Lisää uusi piste olemassa olevaan polkuun" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Kartta-asetukset" - -#: ../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 "Lisättävät objektit:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Muokattavat objektit:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Poistettavat objektit:" - -#: ../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] "Lisättävät objektit:" -msgstr[1] "Lisättävät objektit:" - -#: ../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] "Muokattavat objektit:" -msgstr[1] "Muokattavat objektit:" - -#: ../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] "Poistettavat objektit:" -msgstr[1] "Poistettavat objektit:" - -#: ../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 "Edellinen muutos {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Lähennä" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Loitonna" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Takaisin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Siirry takaisin" - -#: ../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 "Ääni: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Nopeammin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Nopeammin eteenpäin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Eteenpäin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Siirry eteenpäin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Toista/tauko" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Toista/tauko" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Hitaammin" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Hitaammin eteenpäin" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Ladataan GPS-dataa" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Ladattu GPX-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Raaka GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Ladataan dataa" - -#: ../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 "Dataa ei tuotu." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreeMap-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Poistotila" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Poista pisteitä tai polkuja." - -#: ../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 "Tila: {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 "" -"Napsauta poistaaksesi. Shift: poista vain yksi yhteys polusta. Alt: jätä " -"kaikki pisteet poistettavasta polusta. Ctrl: poista kaikki pistettä " -"käyttävät polut." - +#: ../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 @@ -2061,7 +1025,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 @@ -2070,6 +1035,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 @@ -2100,4 +1065,889 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Yhdistä {0} pistettä" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Liitä valinta" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Peilaa" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Peilaa valitut pisteet ja polut" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Valitse ainakin yksi solmu tai tie" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "ylös" + +#: ../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 "Siirrä objektit {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "alas" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "vasen" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "oikea" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Siirrä {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Siirtää objektit {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 "Objekteja ei voi siirtää maailman ulkopuolelle" + +#: ../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 "Uusi" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Luo uusi kartta." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Avaa..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Avaa tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Avataan tiedostoja" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Avataan tiedostoa \"{0}\"..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Avaa sijainti..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Avaa URL-osoite." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Erota taso" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Anna ladattavan alueen URL-osoite:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Latauksen sijainti" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Lataa URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Suorakulmaista muoto" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Vain kaksi pistettä sallittu" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Valinnan pitää muodostua pelkistä poluista." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." + +#: ../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 "Vain yksi piste valittuna" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Suorakulmaista" + +#: ../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 "Liitä" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Liitä leikepöydän sisältö" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Liitä tagit" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Liitä valituille kohteille avain/arvo-parit leikepöydältä." + +#: ../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 "Asetukset..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Muokkaa JOSM:n asetuksia." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Asetukset" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Toista" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Toista edellinen kumottu toiminto" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Nimeä taso uudelleen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Nimeä myös tiedosto uudelleen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Käännä polut" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Kääntää valittujen polkujen suunnan." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Valitse ainakin yksi polku." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Käännä polut" + +#: ../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 "Tallenna" + +#: ../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 "Tallenna tämänhetkinen data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?" + +#: ../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 "Tyhjä dokumentti" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Tallenna silti" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokumentti ei sisällä tietoa" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Ristiriidat" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Hylkää ristiriidat ja tallenna" + +#: ../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 "" +"Et ole ratkaissut ristiriitoja. Vain omat versiosi tallennetaan, ei tietoa " +"ristiriidoista. Jatka tallennusta?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Tallenna OSM-tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Tallenna GPX-tiedosto" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Tallenna kerros" + +#: ../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 "Tallenna nimellä..." + +#: ../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 "Tallenna data uuteen tiedostoon." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Valitse kaikki" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Valitse tason kaikki palautetut objektit. Tämä valitsee myös keskeneräiset " +"objektit." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Näytä raportti" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Raportti" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopioi leikepöydälle ja sulje" + +#: ../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 "Sulje" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Katkaise polku" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Katkaisee polun valitun pisteen kohdalta." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Valintaa ei voida käyttää jakamiseen." + +#: ../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] "Valittu piste ei ole minkään polun keskellä." +msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua." + +#: ../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] "" +"Useampi kuin yksi polku kulkee valitun pisteen kautta. Ole hyvä ja valitse " +"myös polku jonka haluat katkaista." +msgstr[1] "" +"Useampi kuin yksi polku kulkee valittujen pisteiden kautta. Ole hyvä ja " +"valitse myös polku jonka haluat katkaista." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Valitut pisteet eivät ole samalla polulla." + +#: ../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] "Valittu polku ei sisällä valittua pistettä." +msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä." + +#: ../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 "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi." + +#: ../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 "" +"Polkua ei voida katkaista valittujen pisteiden kohdalta. (Vihje: Valitse " +"pisteitä, jotka eivät ole polun päissä.)" + +#: ../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 "Katkaise polku {0} {1} osaksi" + +#: ../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äytä/piilota GPX-viivat" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Piirrä viivat GPS-pisteiden välille." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Vaihda asetuksen \"{0}\" tila" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Erota polut" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Monistaa pisteet, jotka ovat monen polun käytössä." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Valitse joko:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Yksi piste jolla on tageja, tai" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Yksi piste, joka on useamman polun käytössä, tai" + +#: ../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 "" +"* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" + +#: ../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 "" +"* Yksi polku, jossa on yksi tai useampi piste, jotka ovat myös muiden " +"polkujen käytössä, tai" + +#: ../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 "" +"* Yksi polku ja yksi tai useampi sen pisteistä, jotka ovat useamman polun " +"käytössä." + +#: ../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 "" +"Huomio: Jos valittuna on polku, se saa uudet kopiot monistetuista\n" +"pisteistä ja uudet pisteet tulevat valituiksi. Muussa tapauksessa\n" +"kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Irroitettu piste" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Monista {0} pisteeksi" + +#. 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 "Monista {0} pistettä {1} pisteeksi" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Kumoa" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Peru viimeisin toiminto." + +#: ../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 "Poista valinta" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Poista valinta kaikista objekteista." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta." + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Lähetä OSM-palvelimelle..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." + +#: ../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 "Ei mitään lähetettävää. Hae ensin dataa." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Ei lähetettäviä muutoksia." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Lähennä" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Loitonna" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Takaisin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Siirry takaisin" + +#: ../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 "Ääni: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Nopeammin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Nopeammin eteenpäin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Eteenpäin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Siirry eteenpäin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Toista/tauko" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Toista/tauko" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Hitaammin" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Hitaammin eteenpäin" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Ladataan GPS-dataa" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Ladattu GPX-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Raaka GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Ladataan dataa" + +#: ../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 "Dataa ei tuotu." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreeMap-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Poistotila" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Poista pisteitä tai polkuja." + +#: ../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 "Tila: {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 "" +"Napsauta poistaaksesi. Shift: poista vain yksi yhteys polusta. Alt: jätä " +"kaikki pisteet poistettavasta polusta. Ctrl: poista kaikki pistettä " +"käyttävät polut." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2211,18 +2061,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 "Valitse" -#: ../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 "Valitse, siirrä ja pyöritä objekteja" -#: ../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" @@ -2231,18 +2081,18 @@ 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 "Toteuta siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Kumoa siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2250,8 +2100,6 @@ "Really move them?" msgstr "" -"Siirstämäsi objektien määrä ylitti {0}. Yleensä tämä on virhe.\n" -"Oletko varma että haluat siirtää ne?" - -#: ../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 "" @@ -2418,41 +2266,41 @@ msgstr "Etsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "" -#: ../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 "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../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 "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../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 "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../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 "Löytyi {0} osumaa" -#: ../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 "" @@ -2465,40 +2313,40 @@ "{2}" -#: ../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 "" -#: ../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 "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../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 "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../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 "Päättävä sulkumerkki puuttuu." -#: ../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 "" @@ -2507,5 +2355,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." @@ -2542,42 +2390,42 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Lisää piste" +msgstr "Lisää piste {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "Lisää polku {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relaatiot: {0}" +msgstr "Lisää relaatio {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Muuta {0} objekti" +msgstr "Muuta pistettä {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Edellinen muutos {0}" +msgstr "Muuta polkua {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Muuta relaatiota" +msgstr "Muuta relaatiota {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 @@ -2587,17 +2435,17 @@ #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2667,30 +2515,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] "Poista {0} {1}" -msgstr[1] "Poista {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] "Poistotila" -msgstr[1] "Poistotila" +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] "Poista {0} {1}" -msgstr[1] "Poista {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] "Poista relaatiosta" -msgstr[1] "Poista relaatiosta" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2704,20 +2552,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n" -"Poistetaanko relaatiosta?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n" -"Poistetaanko relaatiosta?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2728,5 +2572,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." @@ -2807,17 +2651,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2827,17 +2671,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Ratkaise {0} ristiriitaa {1} objektissa" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2975,11 +2819,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta " -"tiedostosta tehdään varmuuskopio: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3046,5 +2888,5 @@ msgstr "I" -#: ../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 @@ -3052,23 +2894,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 "parametri ''{0}'' ei saa olla tyhjä" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Virhe: {0}" -#: ../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 "Varoitus: {0}" -#: ../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 @@ -3081,11 +2948,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 "" @@ -3136,9 +3008,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." @@ -3147,119 +3019,119 @@ #. 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 "Poistettu jäsen \"{0}\" relaatiossa." -#: ../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 "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." -#: ../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 "Löytyi enemmän kuin yksi \"from\" -polku" -#: ../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 "Löytyi enemmän kuin yksi \"to\" -polku" -#: ../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 "Useita \"via\" -jäseniä." -#: ../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 "Tuntematon rooli \"{0}\"" -#: ../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 "Ei \"from\"-roolin tietä." -#: ../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 "Ei \"to\"-roolin tietä." -#: ../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 "Ei löytynyt pistettä tai tietä \"via\"-roolissa." -#: ../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 "" "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." -#: ../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 "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." -#: ../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 "Kiellolle {0} ei löydy piirtotyyliä." -#: ../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 "Multipolygonissa jäsenenä muu kuin tie: {0}" -#: ../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 "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." -#: ../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 "Inner-roolin tie \"{0}\" relaation teistä uloimpana." -#: ../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 "ei tageja" -#: ../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 "teksti" @@ -3282,5 +3154,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" @@ -3291,5 +3163,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" @@ -3300,5 +3172,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" @@ -3407,5 +3279,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "rata" @@ -3437,127 +3309,33 @@ msgstr[1] "{0} jäsentä" -#: ../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 "tuntematon" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Tuntematon palvelin" -#: ../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 "" @@ -3768,5 +3546,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}" @@ -4143,4 +3921,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 @@ -4212,8 +3992,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 @@ -4336,5 +4116,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 "poistettu" @@ -4394,5 +4174,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 "" @@ -4434,4 +4214,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 @@ -4445,5 +4226,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 "" @@ -4549,4 +4330,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 ristiriitoja" + +#: ../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 @@ -4559,24 +4376,23 @@ msgstr "kaikki" -#: ../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 "Valitse väri" - -#: ../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}''" @@ -4584,7 +4400,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 "parametri ''{0}'' ei saa olla tyhjä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4597,14 +4413,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 "Ominaisuutta ei ole vielä toteutettu." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4613,17 +4430,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "Anna poluille tagi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Poista relaatiosta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikti latauksen aikana" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4647,24 +4461,8 @@ msgstr[1] "{0} relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Vaihda resoluutiota" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Ratkaise ristiriitoja" - -#: ../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 "Liitä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4679,9 +4477,73 @@ #: ../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} polku" -msgstr[1] "{0} polkua" +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 "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" + +#: ../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 "Oikea nimi" + +#: ../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 "Avain:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Arvo" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Versio" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4709,5 +4571,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}" @@ -4738,5 +4600,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." @@ -4809,13 +4671,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 "Taso: {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 "Relaatiot: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4901,5 +4763,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 "" @@ -4958,5 +4820,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 "Lisää" @@ -5006,5 +4868,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 "Relaatiot" @@ -5099,9 +4961,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] "Tekijä" -msgstr[1] "Tekijä" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5114,7 +4976,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Lisää tietoja tästä ominaisuudesta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5195,5 +5056,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}" @@ -5211,9 +5072,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 "" @@ -5464,11 +5320,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 "" @@ -5482,7 +5338,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Ladataan aikaisia liitännäisiä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5608,5 +5463,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Paikat" @@ -5684,9 +5539,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa raahaamalla " +"oikealla napilla, valitse alue vetämällä vasemmalla napilla." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5735,7 +5593,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Lähetä nykyiset asetukset palvelimelle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6618,52 +6475,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" @@ -6673,21 +6530,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 "Muuta relaatiota" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Lisää tietoja tästä ominaisuudesta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Edellinen muutos {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6705,7 +6560,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Kadunnimi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6746,12 +6600,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Valitse arvo" +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 "parametri ''{0}'' ei saa olla tyhjä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6795,5 +6648,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6811,5 +6664,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 "" @@ -6828,5 +6681,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6840,7 +6693,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Poistu tallentamatta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6853,7 +6705,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Tallenna ja poistu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6931,7 +6782,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Lähetettäessä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6940,12 +6790,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Asetukset" + +#: ../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 "Lisättävät objektit:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Muokattavat objektit:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Poistettavat objektit:" + +#: ../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 "Lähetä muutokset" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Tiedosto" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Lähetetäänkö nämä muutokset?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Lataa uudelleen" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Ole hyvä ja anna nimi sijainnille." + +#: ../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 @@ -7182,5 +7161,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." @@ -7236,7 +7214,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Ladataan dataa" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7297,4 +7274,13 @@ msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" + +#: ../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 "" +"Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään " +"haitallisena.
Jos haluat lähettää jälkiä, katso:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7481,5 +7467,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 "Ole hyvä ja valitse poistettava rivi." @@ -7938,7 +7924,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Näytä objektin tunnus valintalistassa" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7953,7 +7938,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Näytä objektin tunnus valintalistassa" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8318,8 +8302,4 @@ msgstr "Poista käytöstä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Avain:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8376,5 +8356,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 @@ -8385,42 +8365,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Lisää kommentti" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Poista valittu taso." - -#: ../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 "Lisää tietoja tästä ominaisuudesta" #. 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 "Lisäominaisuudet:" -#: ../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 "Käytä esivalintaa \"{0}\" ryhmästä \"{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 "Käytä esivalintaa ”{0}”" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "Tuntematon tyyppi: {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 @@ -8431,15 +8409,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {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 "Virhe käsiteltäessä {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 "" -#: ../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 @@ -8449,18 +8427,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../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 "Ei mitään valittuna!" -#: ../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 "Muuta ominaisuuksia" @@ -8487,5 +8465,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 "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja." @@ -8501,7 +8478,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 @@ -8579,5 +8553,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}" @@ -8585,5 +8559,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" @@ -8591,5 +8565,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" @@ -8610,6 +8583,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 @@ -8619,40 +8592,40 @@ msgstr "Ladataan OSM-karttatietoja..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8714,10 +8687,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 "" @@ -8725,11 +8698,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 "Luodaan muutoskokoelma..." - -#: ../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}" @@ -8737,34 +8708,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 "Luodaan muutoskokoelma..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Luodaan muutoskokoelma..." - -#: ../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 "Luodaan muutoskokoelma..." - -#: ../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 " @@ -8772,44 +8727,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Suljetaan muutoskokoelma..." -#: ../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 "Suljetaan muutoskokoelma..." - -#: ../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 "Luodaan muutoskokoelma..." - -#: ../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 "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Lähetetään..." -#: ../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}." @@ -8828,10 +8783,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 "" @@ -8889,6 +8844,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-palvelintiedostot" @@ -8917,5 +8877,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 "" @@ -8972,74 +8932,139 @@ msgstr "Virhe jäsennettäessä." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Tuntematon versio" - -#: ../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 "Puuttuva pakollinen attribuutti \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "Ristiriidan ratkaisuksi valittu versio:" + +#: ../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 "-elementti muussa kuin polussa." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "-tagi muussa kuin relaatiossa." - -#: ../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 "Relaation jäsenen määrittely puutteellinen: ei voi olla 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 "Virheellinen objekti (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 "Puuttuva pakollinen attribuutti \"{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 "" @@ -9048,16 +9073,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 "Valmistellaan OSM-karttatietoja..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Vääränlainen pisteen id" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Valmistellaan OSM-karttatietoja..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Valmistellaan karttatietoja..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9102,33 +9141,43 @@ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." -#: ../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äljellä. Lähetetään {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äljellä. Lähetetään {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äljellä. Lähetetään {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 "Lähetetään..." + +#: ../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 "Ei mitään lähetettävää. Hae ensin dataa." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9166,11 +9215,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 "" @@ -9183,4 +9227,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 @@ -9223,20 +9272,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 "Poista liitännäinen käytöstä" #: ../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 "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?" -#: ../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 " @@ -9246,5 +9295,9 @@ "on oikeus korvata vanhat tiedostot." -#: ../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 "" @@ -9252,10 +9305,10 @@ msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." -#: ../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 "Liitännäisen sisältämien tietojen mukaan tekijä on {0}." -#: ../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." @@ -9263,9 +9316,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../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 "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../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 " @@ -9275,13 +9328,13 @@ "liitännäisen käytöstä." -#: ../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" @@ -9338,4 +9391,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 "tuntematon" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9411,4 +9495,88 @@ msgstr "(Teksti on jo kopioitu leikepöydälle)" +#: ../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 @@ -9478,5 +9646,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9485,5 +9653,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9492,5 +9660,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9499,5 +9667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9506,5 +9674,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9563,40 +9731,39 @@ msgstr "Lähetä jäljet" -#: ../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 "Kuvaus" -#: ../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}" @@ -9604,47 +9771,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 "Yhdistetään..." -#: ../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 "Lähetys peruttu" -#: ../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 "Virhe lähetettäessä" -#: ../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 "GPX-jäljen lähetys onnistui" -#: ../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 "Lähetään GPX-jälkeä: {0}% ({1} / {2})" -#: ../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 "GPX-tasoa ei valittuna. Ei voida lähettää jälkeä." -#: ../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 "Lähetetään GPX-jälkeä" @@ -9861,5 +10028,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 "" @@ -9873,13 +10040,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 "" @@ -9888,9 +10055,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 "Virheellinen aikavyöhyke" -#: ../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 "" @@ -9899,65 +10066,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 " @@ -9965,13 +10132,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 "" @@ -10009,5 +10176,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 "Virhe ladattaessa tiedostoa" @@ -10054,13 +10221,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" @@ -10069,13 +10236,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 "" @@ -10185,9 +10352,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 "" @@ -10340,7 +10507,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Valitse" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10424,5 +10590,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 "Tyhjä taso" @@ -11358,18 +11524,18 @@ msgstr "Tuntematon ongelman tila" -#: ../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 "Avaa näkymään osuvat..." -#: ../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 "Avaa ainoastaan tiedostot, jotka näkyvät nykyisessä näkymässä." -#: ../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}" @@ -11380,5 +11546,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 " @@ -11388,9 +11554,9 @@ "asetusten karttasivulta." +#: ../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 "" @@ -11401,28 +11567,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Luo uusi piste." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "vaihda valinta" -#: ../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 "vaihda näkymä" -#: ../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 "varmista kaikki etähallinnan toimenpiteet käsin" -#: ../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 "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia." -#: ../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 "Etähallinta" -#: ../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 "Asetukset etähallintaliitännäiselle." -#: ../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 " @@ -11433,28 +11604,35 @@ "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa." -#: ../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 "Sallitut toiminnot" -#: ../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 "Etähallinta on pyytänyt datan lataamista API:sta." -#: ../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 "Pyynnös tiedot: {0}" -#: ../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 "Sallitaanko tämä?" -#: ../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 "Varmista etähallinnan toimenpide" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Etähallinta on pyytänyt datan lataamista API:sta." + +#: ../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 "" @@ -11949,25 +12127,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Syötä arvot kaikille ristiriidoille." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Ratkaise ristiriitoja" + #: ../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 "" @@ -12040,6 +12226,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 "Tarkistusvirheet" @@ -12049,10 +12235,10 @@ msgstr "Ei virheitä" -#: ../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 "Ruudukko" -#: ../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 "" @@ -12143,5 +12329,5 @@ msgstr "Suorittaa datantarkistuksen" -#: ../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 "" @@ -12149,47 +12335,61 @@ "Lähetetäänkö muutokset silti?" -#: ../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 "Avaa tarkistusikkuna." -#: ../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 "Zoomaa ongelmaan" -#: ../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 "Korjaa" -#: ../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 "Korjaa valitut virheet" -#: ../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 "Ohita" -#: ../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 "Ohita valitut virheet seuraavalla kerralla." -#: ../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 "Koko ryhmä" -#: ../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 "Yksittäiset elementit" -#: ../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 "Ei mitään" -#: ../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 "Ohitetaanko koko ryhmä vai yksittäiset elementit?" -#: ../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 "Ohitetaan elementit" + +#: ../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 "Lähetetään..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12215,16 +12415,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Tämä tarkistaa, jos kaksi polkua, rataa tai vesiväylää risteävät samassa " -"tasossa, mutteivät ole yhdistettyinä pisteellä." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Risteävät polut" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12232,19 +12428,18 @@ msgstr "Risteävät polut" -#: ../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 "Päällekkäiset pisteet" -#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Samannimiset solmut" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12252,19 +12447,16 @@ #: ../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 "Monista polku" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Luo kopio polusta" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12847,5 +13039,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12929,5 +13121,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 " @@ -12935,5 +13127,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 "" @@ -12951,17 +13143,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 "" @@ -13005,15 +13197,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -13024,14 +13216,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Virheellinen päivämäärä" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13040,96 +13231,108 @@ "resoluutiota" -#: ../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 "Vaihda resoluutiota" -#: ../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 "Tallenna WMS-taso tiedostoon" -#: ../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 "Lataa WMS-taso tiedostosta" -#: ../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 "WMS" -#: ../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 "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "WMS-liitännäisen asetukset" -#: ../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 "Voit muokata käytettävissä olevien WMS-palvelinten listaa" -#: ../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 "Sovita näkymä valittuihin kohteisiin" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Päällekkäiset alueet" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Valitse ainakin yksi polku." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "pohjoinen" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13496,5 +13699,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 "Numero" @@ -14036,7 +14239,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Alppimaja" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14057,8 +14259,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 "Vuokraamo" +msgstr "" #. color heath @@ -14076,5 +14277,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ä" @@ -14087,7 +14289,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "pihakatu" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14123,7 +14324,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "mukulakivi" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14134,7 +14334,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "keskeneräinen" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14145,7 +14344,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "ruoho" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14339,4 +14537,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" @@ -14365,12 +14564,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 "kyllä" #. color permissive -#. +#. #. 1 #. 40000 @@ -14418,5 +14617,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14453,5 +14652,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14515,6 +14714,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 "ei" @@ -14660,6 +14860,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 "Tyyppi" @@ -14930,7 +15130,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Kävelykatu" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14949,7 +15148,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Esteet" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15241,7 +15439,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 "Operaattori" @@ -15454,6 +15652,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 "" @@ -16365,7 +16563,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" @@ -16413,23 +16608,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 "Aukioloajat" @@ -16453,5 +16648,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" @@ -16498,22 +16692,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 "" @@ -16528,22 +16722,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 "" @@ -16558,22 +16752,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 "" @@ -16607,5 +16801,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 "" @@ -16625,7 +16819,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Merkitse valmiiksi" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16639,7 +16832,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Paikkojen lukumäärä" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16649,12 +16841,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Invapaikkojen lukumäärä" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Invapaikkojen lukumäärä" +msgstr "" #: build/trans_presets.java:1400 @@ -16856,5 +17046,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17239,7 +17429,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "-" +msgstr "" #. color tertiary @@ -17282,28 +17471,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "kiinalainen" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Lataa alue" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Liitä" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Iso kaupunki" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "paikallinen" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17331,7 +17515,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Lähde" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17345,7 +17528,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "sivuraide" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17362,13 +17544,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Muokkaa maanosan ominaisuuksia" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Poliisiasema" +msgstr "" #: build/trans_presets.java:1737 @@ -17385,7 +17565,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "maankäyttö" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17396,19 +17575,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Tiedot" +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 "gps-jäljen kuvaus" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Ääni" +msgstr "" #. @@ -17419,7 +17595,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Puhelinnumero" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17743,5 +17918,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17775,5 +17950,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18899,6 +19074,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 "Uskonto" @@ -18907,66 +19082,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -18975,76 +19150,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19376,5 +19551,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 "" @@ -19399,5 +19574,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 "Kolikot" @@ -19405,5 +19580,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 "" @@ -19411,5 +19586,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 "" @@ -19417,5 +19592,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 "" @@ -19423,5 +19598,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 "Luottokortit" @@ -19480,10 +19655,143 @@ msgstr "Penkki" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Takaisin" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Muistomerkki" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "ei mitään" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Perus" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Väri" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Takaisin" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "alas" + +#. 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 "" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Arvo" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "vesi" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Johtojen määrä" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Metsästyslava" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Muokkaa metsästyslavan ominaisuuksia" @@ -19492,30 +19800,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 "Korkeus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "täysi" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Lähde" @@ -19524,10 +19832,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Muokkaa lähteen ominaisuuksia" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Juomavesi" @@ -19536,10 +19844,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Muokkaa juomaveden ominaisuuksia" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19547,35 +19855,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 "Kaupat" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Alppimaja" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Muokkaa kaupungin ominaisuuksia" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Lähikauppa" @@ -19583,9 +19889,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Muokkaa lähikaupan tietoja" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kioski" @@ -19593,29 +19899,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Muokkaa kioskin ominaisuuksia" -#: 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 "Muokkaa linja-autopysäkin ominaisuuksia" - -#: 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 "Muokkaa puun ominaisuuksia" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Automaatti" @@ -19623,5 +19927,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Muokkaa automaatin tietoja" @@ -19629,88 +19933,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Automaatin tuotteet" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "juomat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "Lihakauppa" @@ -19718,9 +20022,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Muokkaa lihakaupan ominaisuuksia" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Leipomo" @@ -19728,9 +20032,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Muokkaa leipomon ominaisuuksia" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "" @@ -19738,18 +20042,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Luomukauppa" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Muokkaa luomukaupan ominaisuuksia" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19757,54 +20061,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19812,9 +20116,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19822,9 +20126,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Tee-se-itse-kauppa" @@ -19832,54 +20136,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Kampaamo" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Muokkaa kampaamon ominaisuuksia" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Kuivapesula" @@ -19887,9 +20191,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Muokkaa kuivapesulan ominaisuuksia" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Pesula" @@ -19897,9 +20201,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Muokkaa pesulan ominaisuuksia" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19907,32 +20211,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Muokkaa optikon ominaisuuksia" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Raha" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Pankki" @@ -19940,14 +20244,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Muokkaa pankin ominaisuuksia" -#: 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 "Pankkiautomaatti" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Rahanvaihto" @@ -19955,5 +20259,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Muokkaa rahanvaihdon ominaisuuksia" @@ -19961,15 +20265,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Muokkaa pankkiautomaatin ominaisuuksia" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Terveys" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Lääkäri" @@ -19977,18 +20281,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Muokkaa lääkärin ominaisuuksia" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Hammaslääkäri" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Muokkaa hammaslääkärin ominaisuuksia" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apteekki" @@ -19996,5 +20300,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Muokkaa apteekin ominaisuuksia" @@ -20002,9 +20306,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Sairaala" @@ -20012,10 +20316,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Muokkaa sairaalan ominaisuuksia" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20024,5 +20328,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20031,20 +20335,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Puhelinnumero" #. 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 "" @@ -20052,5 +20356,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 "Eläinlääkäri" @@ -20059,55 +20363,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Muokkaa eläinlääkärin ominaisuuksia" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Maanosa" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Muokkaa maanosan ominaisuuksia" #. 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 "Muokkaa maan ominaisuuksia" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Osavaltio" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Muokkaa osavaltion ominaisuuksia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Seutu" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -20115,15 +20419,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Iso kaupunki" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Kaupunki" @@ -20131,10 +20435,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Kaupunginosa" @@ -20142,25 +20446,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Muokkaa kaupunginosan ominaisuuksia" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Kunta" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Muokkaa kunnan ominaisuuksia" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Kylä" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Muokkaa kylän ominaisuuksia" @@ -20168,5 +20472,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20174,10 +20478,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Saari" @@ -20185,24 +20489,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Muokkaa saaren ominaisuuksia" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "vasen" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Muokkaa linnan ominaisuuksia" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Luolan suuaukko" @@ -20210,10 +20512,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Muokkaa luolan suuaukon ominaisuuksia" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Huippu" @@ -20221,10 +20523,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Muokkaa huipun ominaisuuksia" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Jäätikkö" @@ -20232,10 +20534,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Muokkaa jäätikön ominaisuuksia" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Tulivuori" @@ -20243,70 +20545,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Muokkaa tulivuoren ominaisuuksia" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Rajat" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Kansallinen" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Muokkaa kansallisen rajan ominaisuuksia" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Hallinnollinen" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Muokkaa hallinnollisen rajan ominaisuuksia" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Muokkaa poliittisen rajan ominaisuuksia" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Muokkaa kansallispuiston rajan ominaisuuksia" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Maankäyttö" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Puu" @@ -20315,15 +20617,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Muokkaa puun ominaisuuksia" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Kasvitieteellinen nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Metsä" @@ -20332,5 +20634,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Muokkaa metsän ominaisuuksia" @@ -20338,17 +20640,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 "havumetsä" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "lehtimetsä" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "sekametsä" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Talousmetsä" @@ -20357,14 +20659,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Muokkaa talousmetsän ominaisuuksia" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Luonnonsuojelualue" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20372,25 +20674,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Kivikko, rakka" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Muokkaa kivikon ominaisuuksia" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Pusikko" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Muokkaa pusikon ominaisuuksia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Tunturi" @@ -20398,10 +20700,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Muokkaa tunturin ominaisuuksia" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Nummi" @@ -20409,5 +20711,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Muokkaa nummen ominaisuuksia" @@ -20415,5 +20717,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)" @@ -20422,45 +20724,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Muokkaa maatilan pihan ominaisuuksia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Peltoalueet" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Viinitarha" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Muokkaa viinitarhan ominaisuuksia" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Siirtolapuutarha" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Muokkaa siirtolapuutarhan ominaisuuksia" @@ -20468,25 +20770,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Puutarha" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Ruoho" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Muokkaa ruohon ominaisuuksia" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20494,10 +20796,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20505,20 +20807,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Puisto" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Muokkaa puiston ominaisuuksia" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20526,5 +20828,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20532,15 +20834,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Asuinalue" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Muokkaa asuinalueen ominaisuuksia" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Hautausmaa (pieni)" @@ -20548,9 +20850,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Muokkaa pienen hautausmaan ominaisuuksia" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Hautausmaa" @@ -20558,39 +20860,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Muokkaa hautausmaan ominaisuuksia" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Kaupallinen" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Muokkaa kaupallisen alueen ominaisuuksia" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Toimistoalue" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Muokkaa toimistoalueen ominaisuuksia" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Teollisuusalue" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Muokkaa teollisuusalueen ominaisuuksia" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Rata-alue" @@ -20598,15 +20900,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Muokkaa rata-alueen ominaisuuksia" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Sotilasvoimat" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia" @@ -20614,55 +20916,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Rakennustyömaa" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Muokkaa rakennustyömaan ominaisuuksia" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Purettuja rakennuksia" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Rakentamiselle raivattu alue" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Kaatopaikka" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Muokkaa kaatopaikan ominaisuuksia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Louhos" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Muokkaa louhoksen ominaisuuksia" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20672,5 +20974,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 "" @@ -20679,10 +20981,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20690,5 +20992,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20697,5 +20999,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20703,34 +21005,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Kielto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20739,15 +21041,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20755,5 +21057,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20762,5 +21064,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20768,5 +21070,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20774,5 +21076,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20838,5 +21140,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 @@ -20845,17 +21147,17 @@ msgstr "polkupyörä" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20908,5 +21210,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 @@ -20915,13 +21217,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20935,10 +21237,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20946,31 +21248,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20979,30 +21281,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24155,76 +24457,4 @@ msgstr "historiallinen" -#. 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 "" - #. color green #. @@ -25192,90 +25422,87 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." +#. 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 "Kaikki polut olivat tyhjiä" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?" + +#~ msgid "Merge Anyway" +#~ msgstr "Yhdistä silti" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " -#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." +#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti " +#~ "yhdistää ne?" + +#~ msgid "Unknown version" +#~ msgstr "Tuntematon versio" + +#~ msgid "Found element in non-way." +#~ msgstr "-elementti muussa kuin polussa." + +#~ msgid "Found element in non-relation." +#~ msgstr "-tagi muussa kuin relaatiossa." + +#~ msgid "Ill-formed node id" +#~ msgstr "Vääränlainen pisteen id" + +#~ msgid "Aborting..." +#~ msgstr "Keskeytetään..." + +#~ msgid "Add Selected" +#~ msgstr "Lisää valitut" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisää valitut objektit jäseniksi" + +#~ msgid "Revert" +#~ msgstr "Palauta" + +#~ msgid "Date" +#~ msgstr "Päivämäärä" + +#~ msgid "Object" +#~ msgstr "Objekti" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." + +#~ msgid "Email" +#~ msgstr "Sähköpostiosoite" + +#~ msgid "Unknown file extension." +#~ msgstr "Tuntematon tiedostopääte." + +#~ msgid "Error parsing server response." +#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" + +#~ msgid "my version:" +#~ msgstr "minun versioni:" + +#~ msgid "their version:" +#~ msgstr "palvelimen versio:" + +#~ msgid "Change" +#~ msgstr "Muokkaa" #~ msgid "Delete {1} {0}" #~ msgstr "Poista {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata." - -#~ msgid "Delete Layer" -#~ msgstr "Poista taso" - -#~ msgid "Authors: {0}" -#~ msgstr "Muokkaajat: {0}" - -#~ msgid "Public" -#~ msgstr "Julkinen" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen " -#~ "lähettämistä." - -#~ msgid "map" -#~ msgstr "kartta" - -#~ msgid "bicyclemap" -#~ msgstr "pyöräkartta" - -#~ msgid "Aborting..." -#~ msgstr "Keskeytetään..." - -#~ msgid "Add Selected" -#~ msgstr "Lisää valitut" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lisää valitut objektit jäseniksi" - -#~ msgid "Revert" -#~ msgstr "Palauta" - -#~ msgid "Date" -#~ msgstr "Päivämäärä" - -#~ msgid "Object" -#~ msgstr "Objekti" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." - -#~ msgid "Email" -#~ msgstr "Sähköpostiosoite" - -#~ msgid "Unknown file extension." -#~ msgstr "Tuntematon tiedostopääte." - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" - -#~ msgid "Error parsing server response." -#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" - -#~ msgid "my version:" -#~ msgstr "minun versioni:" - -#~ msgid "their version:" -#~ msgstr "palvelimen versio:" - -#~ msgid "Change" -#~ msgstr "Muokkaa" #~ msgid "Move" @@ -25378,4 +25605,7 @@ #~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus." +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." + #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?" @@ -25386,4 +25616,10 @@ #~ msgid "Drawbridge" #~ msgstr "Laskusilta" + +#~ msgid "map" +#~ msgstr "kartta" + +#~ msgid "bicyclemap" +#~ msgstr "pyöräkartta" #~ msgid "{0} object has conflicts:" @@ -25394,4 +25630,7 @@ #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle." #~ msgid "Occupied By" @@ -25438,7 +25677,4 @@ #~ "uudelleen." -#~ msgid "resolved version:" -#~ msgstr "Ristiriidan ratkaisuksi valittu versio:" - #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" @@ -25447,6 +25683,19 @@ #~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin" +#~ msgid "Authors: {0}" +#~ msgstr "Muokkaajat: {0}" + #~ msgid "Conflicts: {0}" #~ msgstr "Ristiriidat: {0}" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " +#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -25469,7 +25718,18 @@ #~ msgstr "Tagit (tyhjä arvo poistaa tagin)" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata." + #~ msgid "Remove Selected" #~ msgstr "Poista valitut" +#~ msgid "Delete Layer" +#~ msgstr "Poista taso" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen " +#~ "lähettämistä." + #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n" @@ -25486,14 +25746,4 @@ #~ msgid "Server does not support changesets" #~ msgstr "Palvelin ei tue muutoskokoelmia" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa " -#~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla." - -#~ msgid "Basic" -#~ msgstr "Perus" #~ msgid "Edit Drawbridge" @@ -25510,4 +25760,7 @@ #~ "lähetetyillä elementeillä on historia." +#~ msgid "Public" +#~ msgstr "Julkinen" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 17594) +++ /applications/editors/josm/i18n/po/fr.po (revision 17595) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-05 16:41+0000\n" -"Last-Translator: David Crochet \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-08 17:55+0000\n" +"Last-Translator: François Blondel \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,8 +14,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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" @@ -23,5 +23,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 @@ -30,18 +30,20 @@ msgstr "Aide" -#: ../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 "La projection {0} ne peut être activée. Utilisation de Mercator" -#: ../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 @@ -57,8 +59,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 @@ -72,6 +74,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 @@ -81,5 +83,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 @@ -99,13 +101,13 @@ #: ../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 "Erreur" -#: ../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?" @@ -113,44 +115,41 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" -"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " -"et continuer ?" +"Il y a des modifications non sauvegardées dans {0} calque. Ignorer les " +"modifications et continuer ?" msgstr[1] "" -"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " -"et continuer ?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +"Il y a des modifications non sauvegardées dans {0} calques. Ignorer les " +"modifications et continuer ?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -#: ../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 "Enregistrer et quitter" -#: ../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 "Annuler et quitter" -#: ../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 @@ -159,11 +158,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 @@ -177,20 +177,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 "Annuler" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorant l’URL malformé : \"{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 @@ -207,16 +207,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 @@ -246,17 +246,17 @@ msgstr "Avertissement" -#: ../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 "Ignorant l URL malformé du fichier : \"{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 -#, fuzzy, java-format +#: ../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}" msgstr "" -"Lecture du fichier \"{0}\" impossible. L’erreur est :
{1}
" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -343,5 +343,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 "Greffons" @@ -356,22 +356,19 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " -"d’historique des primitives OSM échouera probablement. l’URL de l’API est : " -"\"{0}\"" +"ATTENTION : format imprévu pour l'URL de base de l'API. La redirection pour " +"la page d'info ou d'historique pour la primitive OSM échouera probablement. " +"L'URL de base de l'API est : ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " -"d’historique des primitives OSM échouera probablement. l’URL de l’API est : " -"\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -483,9 +480,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 @@ -519,6 +516,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 @@ -537,11 +534,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 "Information" @@ -563,5 +560,5 @@ msgstr "Veuillez sélectionner au moins trois nœuds." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -572,10 +569,10 @@ "courant : {0}, maximum : {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 "Violation des capacités de l’API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -586,5 +583,5 @@ "primitive supprimée {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -595,9 +592,9 @@ "longueur maximale autorisée {2}. la longueur actuelle est de {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Violation de la condition prédéfinie" -#: ../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}" @@ -654,78 +651,62 @@ msgstr "Aucun conflit sur lequel zoomer" -#: ../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 "Fusionner des chemins" -#: ../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 "Fusionner plusieurs chemins en un seul." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "" +"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Fusionner quand même" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. " +"Voulez-vous encore les fusionner ?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Changer les directions ?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Inverser et fusionner" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " +"la même direction. En retourner certaines ?" + +#: ../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 "" +"Impossible de fusionner les voies (Elles ne peuvent pas être fusionnées en " +"une seule chaîne de nœuds)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Fusionner {0} voies" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "" -"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Fusionner quand même" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. " -"Voulez-vous encore les fusionner ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Changer les directions ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Inverser et fusionner" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " -"la même direction. En retourner certaines ?" - -#: ../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 "Entrer des valeurs pour tous les conflits." - -#: ../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 "Résoudre les conflits" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Fusionner {0} voies" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Toutes les voies étaient vides" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Impossible de fusionner les voies (Elles ne peuvent pas être fusionnées en " -"une seule chaîne de nœuds)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -781,5 +762,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 "Supprimer" @@ -789,15 +770,15 @@ msgstr "Supprimer les objets sélectionnés." -#: ../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 "Écrire dessus" -#: ../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 "Le fichier existe déjà. Écrire dessus ?" @@ -826,10 +807,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}" @@ -862,5 +843,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 @@ -903,7 +884,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Toutes les images" +msgstr "Tous les formats" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -933,5 +913,5 @@ #, java-format msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "" +msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -1041,1081 +1021,25 @@ msgstr "Fusionne le calque courant avec un autre calque" -#: ../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 "Fusionner les nœuds" -#: ../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 "Fusionner les nœuds sur le plus ancien" -#: ../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 "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Fusionner tout de même" - -#: ../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 "" -"Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-" -"vous encore les fusionner ?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin " -"encore utilisé" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Fusionner {0} nœuds" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Fusionner la sélection" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Fusionne les primitives sélectionnées avec un autre calque" - -#: ../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 "Mirroir" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Inverse les nœuds et chemins sélectionnés" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Veuillez sélectionner au moins un nœud ou chemin" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "haut" - -#: ../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 "Déplacer des objets {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "bas" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "gauche" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "droite" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Déplacer {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Déplacer les objets {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 "Impossible de déplacer des objets en dehors de la Terre." - -#: ../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 "Nouveau" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Créer une nouvelle carte." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Ouvrir..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Ouvrir un fichier" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Ouvrir un fichier" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Rôle inconnu \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Ouvrir un emplacement..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Ouvrir une URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Calque séparé" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Saisir l'URL à télécharger :" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Emplacement de téléchargement" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Télécharger l'URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Rendre une forme orthogonale" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Seulement deux nœuds autorisés" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "La selection ne doit contenir uniquement que des chemins" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre " -"nœuds." - -#: ../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 "" -"Vous utilisez la projection EPSG:4326 qui pourrait conduire
à " -"d'indésirables résultats en faisant des alignements rectangulaires." -"
Changez votre projection pour supprimer cet avertissement.
Voulez-" -"vous continuer ?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Seulement un nœud sélectionné" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Orthogonaliser" - -#: ../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 "Coller" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Coller les contenus du presse-papier." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Coller les étiquettes" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Chargement {0}" -msgstr[1] "Chargement {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Restaurer {0} primitives" -msgstr[1] "Restaurer {0} primitives" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Configuration..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Ouvrir la page des préférences pour les réglages généraux." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Préférences" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Refaire" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Refaire la dernière action annulée" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Renommer le calque" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Renommer également le fichier" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Impossible de renommer le fichier \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Inverser les chemins" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Inverser la direction de tous les chemins sélectionnés." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Veuillez sélectionner au moins un chemin." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Inverser les chemins" - -#: ../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 "Sauvegarder" - -#: ../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 "Sauvegarder les données actuelles." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Le fichier {0} existe. L'écraser ?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "Aucun exportateur n'a été trouvés! Rien à sauver." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Document vide" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Le document ne contient pas de données." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Sauvegarder tout de même" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflits" - -#: ../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 "" -"Certains conflits ne sont pas résolus. Les conflits ne seront pas " -"sauvegardés si vous ne les traitez pas. Continuer ?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Rejeter les conflits et sauvegarder" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Sauvegarder le fichier OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Sauvegarder le fichier GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Sauvegarder le calque" - -#: ../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 "Enregistrer sous…" - -#: ../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 "Sauvegarder les données actuelles dans un nouveau fichier." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Tout sélectionner" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Sélectionnez tous les objets non supprimés dans le calque de données. Cela " -"sélectionne aussi les objets incomplets." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Afficher le rapport de statut" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Affiche le rapport de statut avec des informations utiles pouvant être " -"attachées aux bogues." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Aide : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Rapport d'état" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copier vers le presse-papier et fermer" - -#: ../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 "Fermer" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Couper un chemin" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Séparer un chemin au nœud sélectionné." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." - -#: ../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] "Le nœud sélectionné n'est pas au milieu d'un chemin." -msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin." - -#: ../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] "" -"Il y a plus d'un chemin qui utilise le nœud sélectionné. Veuillez " -"sélectionner le chemin également." -msgstr[1] "" -"Il y a plus d'un chemin qui utilise les nœuds sélectionnés. Veuillez " -"sélectionner le chemin également." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Les nœuds sélectionnés ne font pas partie du même chemin." - -#: ../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] "Le chemin sélectionné ne contient pas le nœud sélectionné" -msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés" - -#: ../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 "" -"Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." - -#: ../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 "" -"Le chemin ne peut pas être coupé aux nœuds sélectionnés. (Astuce : " -"sélectionner les nœuds au milieu du chemin.)" - -#: ../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 "Couper le chemin {0} en {1} parties" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Fermeture de la révision..." - -#: ../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 "Fermeture de la révision..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "Il n'y a actuellement pas de calque WMS à ajuster." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Ouverture de la révision..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Fermeture de la révision..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Utiliser les lignes GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Dessiner des lignes entre les points GPS bruts." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Passer à la configuration globale \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Séparer les chemins" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Dupliquer les nœuds utilisés par plusieurs chemins." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Ce nœud n’est pas collé à quelque chose d’autre." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Aucun de ces nœuds ne sont collés à autre chose." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Rien ne peut être séparé dans la sélection actuelle." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Sélectionner au choix :" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Un nœud taggué, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Un nœud utilisé par plus d’un chemin, ou" - -#: ../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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" - -#: ../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 "" -"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" - -#: ../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 "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java: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 "" -"Note : Si un chemin est sélectionné,il recevra des nouvelles copies des\n" -"nœuds séparés et les nouveaux nœuds seront sélectionnés. Sinon, tous\n" -"les chemins recevront leur propre copie et tous les nœuds seront " -"sélectionnés." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nœud séparé" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Dupliquer en {0} nœuds" - -#. 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 "Dupliquer {0} nœuds en {1} nœuds" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Annuler" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Annuler la dernière action." - -#: ../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 "Tout dé-sélectionner" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Dé-sélectionner tous les objets." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Désélectionner tout (Focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Désélectionner tout (Echap)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Mettre à jour les données" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Mettre à jour le calque de données depuis le serveur (télécharger à nouveau " -"les données)" - -#. 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 "Mise à jour des données" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "Pas de jeu de données courant trouvé" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Mettre à jour la sélection" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Met à jour la sélection de primitive depuis le serveur" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "La sélection est vide" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Chargement vers OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Envoyer tous les changements sur le serveur OSM." - -#: ../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 "" -"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Rien à envoyer. Obtenez d’abord des données." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Aucun changement à envoyer." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synchroniser {0} {1} seulement" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Synchroniser tout le jeu de données" - -#: ../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 "" -"L’envoi a échoué car le serveur a une version plus " -"récente de l’un de vos nœuds, chemins ou relations.
Le conflit est vient " -"de {0} d’id {1},
le serveur a la " -"version {2}, votre version est la {3}.

Cliquez {4} " -"pour synchroniser uniquement la primitive en conflit.
Cliquez {5}" -" pour synchroniser le jeu de données local entièrement avec le " -"serveur.
Cliquez {6} pour annuler et continuer l’édition." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Conflit détecté" - -#. 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 "valeur inattendue retournée. Reçue {0}" - -#: ../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 "" -"L’envoi a échoué car le serveur aune version plus " -"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " -"{0} pour synchroniser l’ensemble de votre jeu de données local." -"
Cliquez {1} pour annuler et continuer l’édition.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "L’envoi a échoué.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "L’envoi vers l’API OSM a échoué" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Mise à jour des primitives" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Charger ces changements ?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Envoyer les changements" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "éditer la nouvelle relation dans la couche \"{0}\"" - -#: ../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 "Ajouter un nœud à un chemin existant." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "Charger tous les changements dans une requête" - -#: ../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 "" -"Permettre l'envoi de tous les changements en une requête, désactivez pour " -"utiliser une requête par primitive modifiée" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Réglages de la carte" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "jeu de données" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objets à ajouter :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objets à modifier :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objets à supprimer :" - -#: ../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] "Objets à ajouter :" -msgstr[1] "Objets à ajouter :" - -#: ../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] "Objets à modifier :" -msgstr[1] "Objets à modifier :" - -#: ../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] "Objets à supprimer :" -msgstr[1] "Objets à supprimer :" - -#: ../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 "Dernier changement le {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Zoom avant" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zoom arrière" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Retour" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Aller en arrière" - -#: ../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 "Accélérer" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Avancer plus vite" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Avancer" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Aller en avant" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Marqueur suivant" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Lire le marqueur suivant" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Lecture/Pause" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Lecture et pause du fichier audio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Marqueur précédent" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Lire le marqueur précédent" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Plus lentement" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Avancer plus lentement" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Téléchargement des données GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Données GPX téléchargées" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Données GPS brutes" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Téléchargement des données" - -#: ../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 "Aucune donnée importée" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Données OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Téléchargement de {0} de {1} ({2} restant(s))" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" -"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Erreurs durant le téléchargement" - -#: ../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 "" -"Il y a {0} primitives dans votre jeu de données local qui
semblent " -"supprimées du serveur. Si vous tentez ultérieurement de les supprimer " -"ou
de les mettre à jour, le serveur retournera probablement un
conflit." -"

Cliquez sur {1} pour vérifier l’état de ces " -"primitives
sur le serveur.
Cliquez sur {2} pour " -"ignorer.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Primitives supprimées ou déplacées" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Mode Suppression" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Supprimer les nœuds ou les chemins." - -#: ../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 "Mode: {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 "" -"Cliquer pour supprimer. Maj : supprimer le segment de chemin. Alt : Ne pas " -"supprimer les nœuds non utilisés lors de la suppression du chemin. Ctrl : " -"supprimer tous les objets utilisant cet objet." - +#: ../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 @@ -2126,7 +1050,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 @@ -2135,6 +1060,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 @@ -2165,4 +1090,929 @@ msgstr "le paramètre \"{0}\" ne doit pas être vide" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin " +"encore utilisé" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Fusionner {0} nœuds" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Fusionner la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Fusionne les primitives sélectionnées avec un autre calque" + +#: ../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 "Mirroir" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Inverse les nœuds et chemins sélectionnés" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Veuillez sélectionner au moins un nœud ou chemin" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "haut" + +#: ../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 "Déplacer des objets {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "bas" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "gauche" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "droite" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Déplacer {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Déplacer les objets {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 "Impossible de déplacer des objets en dehors de la Terre." + +#: ../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 "Nouveau" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Créer une nouvelle carte." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Ouvrir..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Ouvrir un fichier" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Ouverture des fichiers" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Ouverture du fichier ''{0}''..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Ouvrir un emplacement..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Ouvrir une URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Calque séparé" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Saisir l'URL à télécharger :" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Emplacement de téléchargement" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Télécharger l'URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Rendre une forme orthogonale" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Seulement deux nœuds autorisés" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "La selection ne doit contenir uniquement que des chemins" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre " +"nœuds." + +#: ../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 "" +"Vous utilisez la projection EPSG:4326 qui pourrait conduire
à " +"d'indésirables résultats en faisant des alignements rectangulaires." +"
Changez votre projection pour supprimer cet avertissement.
Voulez-" +"vous continuer ?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Seulement un nœud sélectionné" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Orthogonaliser" + +#: ../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 "Coller" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Coller les contenus du presse-papier." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Coller les étiquettes" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Collage du tag {0}" +msgstr[1] "Collage des tags {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "vers la primitive {0}" +msgstr[1] "vers les primitives {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Configuration..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Ouvrir la page des préférences pour les réglages généraux." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Préférences" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Refaire" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Refaire la dernière action annulée" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Renommer le calque" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Renommer également le fichier" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Impossible de renommer le fichier \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Inverser les chemins" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Inverser la direction de tous les chemins sélectionnés." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Veuillez sélectionner au moins un chemin." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Inverser les chemins" + +#: ../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 "Sauvegarder" + +#: ../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 "Sauvegarder les données actuelles." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Le fichier {0} existe. L'écraser ?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Aucun exportateur n'a été trouvés! Rien à sauver." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Document vide" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Sauvegarder tout de même" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Le document ne contient pas de données." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflits" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Rejeter les conflits et sauvegarder" + +#: ../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 "" +"Certains conflits ne sont pas résolus. Les conflits ne seront pas " +"sauvegardés si vous ne les traitez pas. Continuer ?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Sauvegarder le fichier OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Sauvegarder le fichier GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Sauvegarder le calque" + +#: ../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 "Enregistrer sous…" + +#: ../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 "Sauvegarder les données actuelles dans un nouveau fichier." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Tout sélectionner" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Sélectionnez tous les objets non supprimés dans le calque de données. Cela " +"sélectionne aussi les objets incomplets." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Afficher le rapport de statut" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Affiche le rapport de statut avec des informations utiles pouvant être " +"attachées aux bogues." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Aide : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Rapport d'état" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copier vers le presse-papier et fermer" + +#: ../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 "Fermer" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Couper un chemin" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Séparer un chemin au nœud sélectionné." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." + +#: ../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] "Le nœud sélectionné n'est pas au milieu d'un chemin." +msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin." + +#: ../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] "" +"Il y a plus d'un chemin qui utilise le nœud sélectionné. Veuillez " +"sélectionner le chemin également." +msgstr[1] "" +"Il y a plus d'un chemin qui utilise les nœuds sélectionnés. Veuillez " +"sélectionner le chemin également." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Les nœuds sélectionnés ne font pas partie du même chemin." + +#: ../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] "Le chemin sélectionné ne contient pas le nœud sélectionné" +msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés" + +#: ../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 "" +"Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." + +#: ../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 "" +"Le chemin ne peut pas être coupé aux nœuds sélectionnés. (Astuce : " +"sélectionner les nœuds au milieu du chemin.)" + +#: ../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 "" +"L'appartenance à une relation basée sur un rôle a été copiée vers tous " +"les nouveaux chemins.
Vous devriez vérifier cela et le corriger si " +"nécessaire." + +#: ../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 "" +"L'appartenance à une relation a été copiée vers tous les nouveaux " +"chemins.
Vous devriez vérifier cela et le corriger si nécessaire." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Couper le chemin {0} en {1} parties" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Fermer ensemble de changements actuel" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Fermer l'ensemble de changements actuel..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Aucun ensemble de changements n'est actuellement ouvert." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "Aucun ensemble de changements ouvert" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Fermeture de l'ensemble de changements" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Utiliser les lignes GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Dessiner des lignes entre les points GPS bruts." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Passer à la configuration globale \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Séparer les chemins" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Dupliquer les nœuds utilisés par plusieurs chemins." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Ce nœud n’est pas collé à quelque chose d’autre." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Aucun de ces nœuds ne sont collés à autre chose." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Rien ne peut être séparé dans la sélection actuelle." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Sélectionner au choix :" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Un nœud taggué, ou" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Un nœud utilisé par plus d’un chemin, ou" + +#: ../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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" + +#: ../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 "" +"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" + +#: ../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 "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java: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 "" +"Note : Si un chemin est sélectionné,il recevra des nouvelles copies des\n" +"nœuds séparés et les nouveaux nœuds seront sélectionnés. Sinon, tous\n" +"les chemins recevront leur propre copie et tous les nœuds seront " +"sélectionnés." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nœud séparé" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Dupliquer en {0} nœuds" + +#. 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 "Dupliquer {0} nœuds en {1} nœuds" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Annuler" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Annuler la dernière action." + +#: ../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 "Tout dé-sélectionner" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Dé-sélectionner tous les objets." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Désélectionner tout (Focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Désélectionner tout (Echap)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Mettre à jour les données" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Mettre à jour le calque de données depuis le serveur (télécharger à nouveau " +"les données)" + +#. 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 "Mise à jour des données" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Pas de jeu de données courant trouvé" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Mettre à jour la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Met à jour la sélection de primitive depuis le serveur" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "La sélection est vide" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Chargement vers OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Envoyer tous les changements sur le serveur OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Il y a des conflits non résolus dans le calque ''{0}''.
Vous devez " +"d'abord les résoudre." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Rien à envoyer. Obtenez d’abord des données." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Aucun changement à envoyer." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synchroniser {0} {1} seulement" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Synchroniser tout le jeu de données" + +#: ../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 "" +"L’envoi a échoué car le serveur a une version plus " +"récente de l’un de vos nœuds, chemins ou relations.
Le conflit est vient " +"de {0} d’id {1},
le serveur a la " +"version {2}, votre version est la {3}.

Cliquez {4} " +"pour synchroniser uniquement la primitive en conflit.
Cliquez {5}" +" pour synchroniser le jeu de données local entièrement avec le " +"serveur.
Cliquez {6} pour annuler et continuer l’édition." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Conflit détecté" + +#. 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 "valeur inattendue retournée. Reçue {0}" + +#: ../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 "" +"L’envoi a échoué car le serveur aune version plus " +"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " +"{0} pour synchroniser l’ensemble de votre jeu de données local." +"
Cliquez {1} pour annuler et continuer l’édition.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "L’envoi a échoué.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "L’envoi vers l’API OSM a échoué" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Mise à jour des primitives" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Envoie des données pour le calque ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Zoom avant" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zoom arrière" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Retour" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Aller en arrière" + +#: ../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 "Accélérer" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Avancer plus vite" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Avancer" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Aller en avant" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Marqueur suivant" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Lire le marqueur suivant" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Lecture/Pause" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Lecture et pause du fichier audio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Marqueur précédent" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Lire le marqueur précédent" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Plus lentement" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Avancer plus lentement" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Téléchargement des données GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Données GPX téléchargées" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Données GPS brutes" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Téléchargement des données" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Ignore l'exception car le téléchargement a été annulé. L'exception était : " +"{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Aucune donnée importée" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Données OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Téléchargement de {0} de {1} ({2} restant(s))" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" +"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Erreurs durant le téléchargement" + +#: ../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 "" +"Il y a {0} primitives dans votre jeu de données local qui
semblent " +"supprimées du serveur. Si vous tentez ultérieurement de les supprimer " +"ou
de les mettre à jour, le serveur retournera probablement un
conflit." +"

Cliquez sur {1} pour vérifier l’état de ces " +"primitives
sur le serveur.
Cliquez sur {2} pour " +"ignorer.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Primitives supprimées ou déplacées" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Mode Suppression" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Supprimer les nœuds ou les chemins." + +#: ../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 "Mode: {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 "" +"Cliquer pour supprimer. Maj : supprimer le segment de chemin. Alt : Ne pas " +"supprimer les nœuds non utilisés lors de la suppression du chemin. Ctrl : " +"supprimer tous les objets utilisant cet objet." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2281,18 +2131,18 @@ "audio à ce point." -#: ../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 "Sélectionner" -#: ../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 "Sélectionner, déplacer et tourner des objets" -#: ../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" @@ -2301,18 +2151,18 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Déplacer des éléments" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Les déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Annuler déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2320,11 +2170,11 @@ "Really move them?" msgstr "" -"Vous avez déplacer plus de {0} éléments. Le déplacement d'un aussi grand " -"nombre d'éléments is souvent une erreur.\n" -"Souhaitez vous les déplacer ?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +"Vous avez déplacé plus de {0} éléments. Déplacer un grand nombre d'éléments " +"est souvent une erreur.\n" +"Confirmez-vous ce déplacement massif ?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2450,7 +2300,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objet avec l'ID spécifié" +msgstr "id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2506,41 +2355,41 @@ msgstr "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Commencer la recherche" -#: ../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 "Aucun résultat trouvé pour \"{0}\"" -#: ../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 "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../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 "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../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 "{0} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2554,5 +2403,5 @@ "{2}" -#: ../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 "" @@ -2560,10 +2409,10 @@ "d'utilisation : clé=valeur" -#: ../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 +msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2572,26 +2421,26 @@ "relation" -#: ../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 "Jeton inattendu : {0}" -#: ../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 "Arguments manquants pour le OU" -#: ../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 "Arguments manquants pour le -" -#: ../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 "Les parenthèses doivent être fermées." -#: ../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 "Erreur de nombre de paramètre pour une opération sur des nœuds." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2603,5 +2452,5 @@ "10-20" -#: ../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." @@ -2638,62 +2487,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Ajouter un nœud" +msgstr "Ajouter le nœud {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Ajouter {0} {1}" +msgstr "Ajouter le chemin {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relations : {0}" +msgstr "Ajouter la relation {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Ensemble de changements {0}" +msgstr "Modifier le nœud {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Ensemble de changements {0}" +msgstr "Modifier le chemin {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Changer la relation" +msgstr "Modifier la relation {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "enlever \"{0}\" de {1} \"{2}\"" +msgstr "Supprimer \"{0}\" du nœud ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "enlever \"{0}\" de {1} \"{2}\"" +msgstr "Supprimer \"{0}\" du chemin ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "enlever \"{0}\" de {1} \"{2}\"" +msgstr "Supprimer \"{0}\" de la relation ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Mettre {0}={1} pour {2}\"{3}\"" +msgstr "Mettre {0}={1} pour le nœud ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Mettre {0}={1} pour {2}\"{3}\"" +msgstr "Mettre {0}={1} pour le chemin ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Mettre {0}={1} pour {2}\"{3}\"" +msgstr "Mettre {0}={1} pour la relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2739,9 +2588,11 @@ "primitmive ''{1}''" msgstr "" +"Attention : La couche ''{0}'' n'existe plus. Impossible de supprimer le " +"conflit pour l'élément ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" -msgstr "" +msgstr "Ajouter conflit pour ''{0}''" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2765,30 +2616,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] "Supprimer {0} {1}" -msgstr[1] "Supprimer {0} {1}" +msgstr[0] "Supprimer {0} objet" +msgstr[1] "Supprimer {0} objets" #: ../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] "Mode Suppression" -msgstr[1] "Mode Suppression" +msgstr[0] "Supprimer {0} nœud" +msgstr[1] "Supprimer {0} nœuds" #: ../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] "Supprimer {0} {1}" -msgstr[1] "Supprimer {0} {1}" +msgstr[0] "Supprimer {0} chemin" +msgstr[1] "Supprimer {0} chemins" #: ../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] "Supprimer de la relation" -msgstr[1] "Supprimer de la relation" +msgstr[0] "Supprimer {0} relation" +msgstr[1] "Supprimer {0} relations" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2802,20 +2653,20 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n" -"Supprimer de la relation ?" +"La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle " +"{2}.
Enlever de la relation ?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"La sélection \"{0}\" est utilisée par la relation \"{1}\".\n" -"Supprimer de la relation ?" +"La sélection \"{0}\" est utilisée par la relation \"{1}\".
Enlever " +"de la relation ?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2826,5 +2677,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." @@ -2883,15 +2734,15 @@ #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Supprimer le nœud ''{0}'' à la position {1} de la relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Supprimer le chemin ''{0}'' à la position {1} de la relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2907,17 +2758,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" +msgstr "Résoudre {0} conflits de tag pour le nœud {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" +msgstr "Résoudre {0} conflits de tag pour le chemin {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" +msgstr "Résoudre {0} conflits de tag pour la relation {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2927,17 +2778,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Résoudre les conflits de version de {0} {1}" +msgstr "Résoudre les conflits de version pour le nœud {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Résoudre les conflits de version de {0} {1}" +msgstr "Résoudre les conflits de version pour le chemin {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Résoudre les conflits de version de {0} {1}" +msgstr "Résoudre les conflits de version pour la relation {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3019,5 +2870,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "Attention : impossible de forcer les préférences pour ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 @@ -3027,11 +2878,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." msgstr "" -"impossible de définir la référence. la référence d’id {0} ne correspond pas " -"à l'historique d’id {1}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3061,4 +2910,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"Attention : fichier de préférences ''{0}'' absent. Création d'un fichier de " +"préférences par défaut." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -3068,4 +2919,6 @@ "file." msgstr "" +"Attention : remplacement du fichier de préférences existant ''{0}'' par un " +"fichier par défaut." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 @@ -3077,11 +2930,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien " -"fichier dans {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3148,5 +2999,5 @@ msgstr "E" -#: ../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 @@ -3154,22 +3005,47 @@ msgstr "Ensemble de changements {0}" -#: ../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 "paramètre {0} > 0 requis. Reçu {1}." -#: ../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 "le paramètre \"{0}\" ne doit pas être vide" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Erreur : {0}" -#: ../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 "Attention : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "index de colonne inattendu. Reçu {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Jeton inattendu : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Jeton inattendu : {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3183,11 +3059,16 @@ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}" -#: ../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 "" @@ -3241,9 +3122,9 @@ "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247 msgid "Area style way is not closed." msgstr "La zone n'est pas fermée." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478 #, java-format msgid "multipolygon way ''{0}'' is not closed." @@ -3252,105 +3133,105 @@ #. 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 "Membre vide dans la relation." -#: ../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 "Membre \"{0}\" supprimé de la relation." -#: ../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 "Chemin \"{0}\" comporte moins de deux points." -#: ../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 "Plus d'un chemin d'origine trouvé." -#: ../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 "Plus d'un chemin \"destination\" trouvé." -#: ../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 "Plus d'un \"via\" trouvé." -#: ../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 "Rôle inconnu \"{0}\"." -#: ../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 "Type de membre inconnu pour \"{0}\"." -#: ../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 "Pas de chemin d'origine trouvé." -#: ../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 "Pas de chemin \"destination\" trouvé." -#: ../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 "Pas de noeud ou de chemin \"via\" trouvé." -#: ../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 "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java: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 "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"." -#: ../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 "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"." -#: ../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 "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" -#: ../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 "Le style de la restriction {0} n'a pas été trouvé." -#: ../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 "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../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 "Non-chemin \"{0}\" dans le multipolygone." -#: ../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 "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../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 "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../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 "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../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." @@ -3358,14 +3239,14 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../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 "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../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 "non étiqueté" -#: ../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 "texte" @@ -3391,5 +3272,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" @@ -3400,5 +3281,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" @@ -3409,5 +3290,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" @@ -3490,7 +3371,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Les signets ne peuvent être lus.
{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3521,5 +3402,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "voie ferrée" @@ -3551,138 +3432,34 @@ msgstr[1] "{0} membres" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" -"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " -"Internet." - -#. 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 "inconnu" - -#: ../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 "" -"L’envoi vers le serveur a échoué car votre jeu " -"de
données courant ne rempli pas une condition préalable.
Le message " -"d’erreur est :
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Condition préalable non remplie" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Exception de sécurité" -#: ../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 "" -"Impossible de se connecter au serveur distant
''{0}''.
Vérifiez " -"votre connexion internet." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Exception de réseau" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 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 +msgstr "Exception E/S" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Éditer sports de raquette" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../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 "" -"Le chargement a échoué car une primitive que " -"vous
essayez de supprimer sur le serveur est déjà supprimée.

Le " -"message d’erreur est :
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitive déjà supprimée" @@ -3832,9 +3609,9 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "Change the folder for all user settings" -msgstr "" +msgstr "Changer le répertoire pour tous les paramètres utilisateur" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3844,4 +3621,7 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"note : pour certaines tâches, JOSM requiert beaucoup de mémoire. Il est peut-" +"être nécessaire d'ajouter l'option Java \n" +" pour augmenter la taille maximale de mémoire allouée" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3904,5 +3684,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}" @@ -4301,4 +4081,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 @@ -4374,8 +4156,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 @@ -4509,5 +4291,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 "supprimé" @@ -4567,10 +4349,10 @@ #: ../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 "Non, annuler" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4578,7 +4360,4 @@ "yo agree?" msgstr "" -"Pour conserver votre version locale, JOSM
doit réinitialiser l’id " -"de {0} {1} à 0.
Lors du prochain envoi le serveur lui assignera un nouvel " -"id
Êtes-vous d'accord ?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4612,4 +4391,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 @@ -4623,5 +4403,5 @@ msgstr "Primitive" -#: ../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 "" @@ -4732,4 +4512,40 @@ msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}" +#: ../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 "Aucun conflit d’étiquette n'est résolu" + +#: ../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 "Appliquer" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4742,24 +4558,23 @@ msgstr "all" -#: ../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 "Choisir une couleur" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgstr "Choisir une valeur" + +#: ../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 -#, fuzzy, java-format +msgstr "Choisissez les valeurs à conserver" + +#: ../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 "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "La valeur ''{0}'' va être appliquée à la clé ''{1}''" + +#: ../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}''" @@ -4767,12 +4582,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "le paramètre \"{0}\" ne doit pas être vide" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4780,15 +4595,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "non supprimé" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Pas encore implémenté." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4797,17 +4612,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "chemin d'origine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Supprimer de la relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Conflits dans les données" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4831,24 +4643,8 @@ msgstr[1] "{0} relations" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Résolution de conflits" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Résoudre les conflits" - -#: ../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 "Appliquer" - #: ../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 "Coller" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4863,9 +4659,75 @@ #: ../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} voie" -msgstr[1] "{0} voies" +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 "Supprimer le membre de cette relation de l'entrée actuelle de la table" + +#: ../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 "lieu" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Ne pas départager" + +#. --- 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 "Rôle :" + +#: ../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 "Clé :" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Valeur" + +#: ../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 "Sens unique" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Révision" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4892,5 +4754,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}" @@ -4923,5 +4785,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." @@ -4996,13 +4858,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 "Couche : {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 "Relations : {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5088,5 +4950,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 "" @@ -5146,5 +5008,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 "Ajouter" @@ -5194,5 +5056,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 "Relations" @@ -5290,9 +5152,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] "Auteur" -msgstr[1] "Auteur" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5301,20 +5163,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Afficher" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Plus d'informations à propos de cette balise" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} " -"primitives sélectionnées uniquement." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5391,5 +5249,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}" @@ -5409,9 +5267,4 @@ msgid "Child Relations" msgstr "Relations enfants" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Rôle :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5665,11 +5518,11 @@ msgstr "Lié" -#: ../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 "télécharger les relations référentes" -#: ../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 "" @@ -5683,7 +5536,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Charger les relations parentes" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5813,5 +5665,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Lieux/endroits" @@ -5889,9 +5741,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom : molette de souris ou double-clic. Déplacer la carte : garder le " +"bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5921,17 +5776,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Historique de {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Historique de {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Historique de {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5940,7 +5795,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Afficher l'historique de la primitive sélectionnée" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5983,22 +5837,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Chargement de l’historique de {0} d’id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Chargement de l’historique de {0} d’id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Chargement de l’historique de {0} d’id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6833,78 +6687,74 @@ #: 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 "Nom" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Version {0} créée le {1} par " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Ensemble de changements {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Plus d'informations à propos de cette balise" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Ensemble de changements {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6922,7 +6772,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nom de la rue" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6963,12 +6812,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Veuillez sélectionner une valeur" +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 "La couche \"{0}\" doit se trouver dans la liste des couches" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -7013,6 +6861,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Corriger les conflits d'étiquettes" +msgid "Unsaved data and conflicts" +msgstr "Résoudre les conflits" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -7029,5 +6877,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 "" @@ -7046,5 +6894,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -7058,7 +6906,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Annuler et quitter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7071,7 +6918,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Enregistrer et quitter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7149,7 +6995,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "À l’envoi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7158,17 +7003,158 @@ #: ../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 "Utiliser un nouvel ensemble de changements et le fermer" + +#: ../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 "" +"Choisir pour envoyer les données en utilisant un nouvel ensemble de " +"changements et pour fermer ce dernier après l'envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert" + +#: ../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 "" +"Choisir pour envoyer les données en utilisant un nouvel ensemble de " +"changements et pour le laisser ouvert après l'envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 +msgid "Upload to a new or to an existing changeset?" +msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "Charger tous les changements dans une requête" + +#: ../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 "" +"Permettre l'envoi de tous les changements en une requête, désactivez pour " +"utiliser une requête par primitive modifiée" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Paramètres" + +#: ../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 "Tags du nouvel ensemble de changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Objets à ajouter :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objets à modifier :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objets à supprimer :" + +#: ../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] "{0} objet à ajouter :" +msgstr[1] "{0} objets à ajouter :" + +#: ../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] "{0} objet à modifier :" +msgstr[1] "{0} objets à modifier :" + +#: ../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] "{0} objet à supprimer :" +msgstr[1] "{0} objets à supprimer :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" +"Utiliser la session de modification existante {0} et la fermer après l'envoi." + +#: ../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 "" +"Envoyer avec la session de modification existante {0} et la fermer après cet " +"envoi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "" +"Utiliser la session de modification existante {0} et la conserver ouverte." + +#: ../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 "" +"Envoyer avec la session de modification existante {0} et la laisser ouverte " +"pour d'autres envois." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Attributs de la session de modification {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Envoyer les changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Fichier" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Charger ces changements ?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Téléchargement" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Entrer un nom pour cet emplacement." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Annuler les changements et fermer" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7401,5 +7387,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." @@ -7458,7 +7443,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Téléchargement des données" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7527,4 +7511,14 @@ msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" + +#: ../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 "" +"L’envoi de données GPS non mises en forme comme données
sur la " +"carte est considéré comme nuisible.
Si vous voulez envoyer des traces, " +"regardez ici :" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7723,5 +7717,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 "Veuillez sélectionnez la rangée à supprimer." @@ -8219,7 +8213,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Montrer l'ID de l'objet dans les listes de sélections" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8234,7 +8227,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Montrer l'ID de l'objet dans les listes de sélections" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8613,8 +8605,4 @@ msgstr "Désactiver" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Clé :" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8671,5 +8659,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 @@ -8680,42 +8668,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Ajouter un nouveau calque" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Supprimer le calque sélectionné." - -#: ../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 "Plus d'informations à propos de cette balise" #. 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 "Attributs optionnels:" -#: ../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 "Utiliser la balise \"{0}\" du groupe \"{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 "Utiliser la balise \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "voie sans issue" -#: ../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 "Type inconnu : {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 @@ -8726,15 +8712,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {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 "Erreur de traitement {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 "Les éléments de type {0} sont avalisés." -#: ../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 @@ -8744,18 +8730,18 @@ msgstr[1] "Changer {0} objets." -#: ../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 "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Changer les propriétés" @@ -8782,5 +8768,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 "" @@ -8798,7 +8783,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 @@ -8876,5 +8858,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}" @@ -8882,5 +8864,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" @@ -8888,5 +8870,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" @@ -8911,6 +8892,6 @@ "déduire le type de primitive" -#: ../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 @@ -8920,20 +8901,20 @@ msgstr "Téléchargement des données OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "éditer la relation #{0} dans la couche \"{1}" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8941,20 +8922,20 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java: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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9021,10 +9002,10 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../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 "format d’id inattendu reçu du serveur, reçu \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -9034,11 +9015,9 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Ouverture de la révision..." - -#: ../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}" @@ -9046,34 +9025,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 "Ouverture de la révision..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Ouverture de la révision..." - -#: ../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 "Ouverture de la révision..." - -#: ../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 " @@ -9081,44 +9044,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../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 "Fermeture de la révision..." - -#: ../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 "Ouverture de la révision..." - -#: ../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 "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Attends 10 secondes… " -#: ../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}." @@ -9137,10 +9100,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 "Fichiers compressés bzip2 du serveur OSM" -#: ../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 "Fichier bz2 invalide." @@ -9203,6 +9166,11 @@ "encodé dans l'URL.
N'utilisez pas un mot de passe de valeur." +#: ../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 "Fichiers du serveur OSM" @@ -9233,5 +9201,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 "Fichiers compressés gzip du serveur OSM" @@ -9300,80 +9268,151 @@ msgstr "Erreur pendant l’analyse syntaxique." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Version inconnue" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Il manque le numéro de version dans les données OSM." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "attribut obligatoire \"{0}\" manquant" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "attribut obligatoire \"{0}\" manquant" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Version inconnue : {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "attribut obligatoire \"{0}\" manquant" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Élément trouvé sur un non-chemin." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " n’a pas de ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Élément trouvé dans une non-relation." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" msgstr "" "Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, " "valeur {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" +msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" +"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, " +"valeur {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "" -"Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, " -"valeur {2}" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, " +"valeur {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Champ incomplet avec 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "L’objet avec l’id=0 est illégal" -#: ../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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Donnée invalide pour l'attribut \"version\" sur la primitive OSM d'id {0}, " "valeur {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Version inconnue : {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Attribut requis manquant \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " +"\"{1}\"" + +#: ../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 "" @@ -9382,16 +9421,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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Préparation des données de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "id du nœud mal formé" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Scrutation des données de l'historique d'OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Préparation des données..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9438,33 +9491,43 @@ "Internet." -#: ../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} restant(s). Chargement de {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} restant(s). Chargement de {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} restant(s). Chargement de {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 "Envoi en cours..." + +#: ../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 "Rien à envoyer. Obtenez d’abord des données." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9502,12 +9565,7 @@ msgstr "Téléchargement du greffon {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Annuler le téléchargement" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "Version {0} de JOSM requise pour le greffon {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9519,4 +9577,9 @@ msgstr "Annuler le téléchargement" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Version {0} de JOSM requise pour le greffon {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9559,20 +9622,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 "Désactiver le greffon" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Garder le greffon" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Garder le greffon" - -#: ../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 " @@ -9582,5 +9645,9 @@ "l’autorisation de remplacer les greffons existants." -#: ../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 "" @@ -9589,10 +9656,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../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 "D’après les informations du greffon, l’auteur est {0}." -#: ../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." @@ -9601,9 +9668,9 @@ "d'extension avant de rapporter un bug." -#: ../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 "Ce module d'extension doit-il être désactivé ?" -#: ../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 " @@ -9613,14 +9680,14 @@ "greffon ne soit plus chargé." -#: ../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 "" "Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Informations sur le greffon" -#: ../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" @@ -9676,4 +9743,35 @@ "\n" "{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 "inconnu" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9751,4 +9849,102 @@ msgstr "(Ce texte a déjà été copié dans votre presse-papier.)" +#: ../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 "" +"L’envoi vers le serveur a échoué car votre jeu " +"de
données courant ne rempli pas une condition préalable.
Le message " +"d’erreur est :
{0}" + +#: ../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 "" +"Impossible de se connecter au serveur distant
''{0}''.
Vérifiez " +"votre connexion internet." + +#: ../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 "" +"Le serveur OSM
''{0}''
a rapporté une erreur interne du serveur." +"
Il s'agit probablement d'un problème temporaire. Veuillez réessayer plus " +"tard." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162 +#, java-format +msgid "The OSM server ''{0}'' reported a bad request.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165 +#, fuzzy +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 "" +"La taille maximum de la zone à télécharger est 0.25 et votre requête en " +"demande plus. Demandez un plus petit nombre ou utilisez le planet.osm" + +#: ../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 "" +"Le chargement a échoué car une primitive que " +"vous
essayez de supprimer sur le serveur est déjà supprimée.

Le " +"message d’erreur est :
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9821,5 +10017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9828,5 +10024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9835,5 +10031,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9842,5 +10038,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9849,5 +10045,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9908,40 +10104,39 @@ msgstr "Charger les traces" -#: ../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 "Description" -#: ../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 "Veuillez saisir une description de votre trace." -#: ../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 "Veuillez entrer des mot-clés liés à votre trace." -#: ../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}" @@ -9949,47 +10144,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 "Connexion..." -#: ../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 "Envoi annulé" -#: ../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 "Erreur lors du chargement" -#: ../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 "Succès de l'envoi de la trace GPX" -#: ../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 "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../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 "Envoyer la trace GPX : {0}% ({1} ou {2})" -#: ../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 "Pas de description fournie. Merci de fournir une description." -#: ../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 "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../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 "Pas de nom d'utilisateur fourni." -#: ../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 "Pas de mot de passe fourni." -#: ../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 "Envoyer la trace GPX" @@ -10209,5 +10404,5 @@ msgstr "Images non encore étiquetées" -#: ../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 "Correler les images avec la trace GPX" @@ -10221,13 +10416,13 @@ msgstr "Estimation automatique" -#: ../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 "Vous devez sélectionner une trace GPX" -#: ../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 "Aucune trace GPX sélectionnée" -#: ../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 "" @@ -10238,9 +10433,9 @@ "Format attendu : {0}" -#: ../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 "Fuseau horaire invalide" -#: ../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 "" @@ -10251,27 +10446,27 @@ "Format attendu : {0}" -#: ../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 "Décallage invalide" -#: ../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 "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" -#: ../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 "Trace GPX chargée" -#: ../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 "" "Les photos sélectionnées ne contiennent pas d'information d'horodatage." -#: ../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 "Les photos ne contienne tpas d'information d'horodatage" -#: ../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." @@ -10280,39 +10475,39 @@ "autre." -#: ../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 "La trace GPX n'a pas d'horodatage." -#: ../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 "Fuseau horaire : {0}" -#: ../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 "Minutes : {0}" -#: ../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 "Secondes : {0}" -#: ../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 "{0} photo(s) sur {1} correspond(ent) à la trace GPX." -#: ../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 "(Différence de temps de {0} jours)" -#: ../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 "Différence entre la trace et les photos : {0}min. {1}sec." -#: ../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 " @@ -10323,13 +10518,13 @@ "manuellement." -#: ../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 "La correspondance des photos avec la trace a échoué" -#: ../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 "Ajuster le fuseau horaire et le décalage" -#: ../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 "Valeurs par défaut" @@ -10370,5 +10565,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 "Erreur lors du chargement du fichier" @@ -10397,11 +10592,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Ville {0} non trouvée ou non disponible sur le WMS.\n" -"Veuillez vérifier sa disponibilité sur www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10417,13 +10610,13 @@ msgstr "Choisir parmi..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../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" @@ -10437,13 +10630,13 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../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 "JOSM est arreté pour que la modification prenne effet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10573,9 +10766,9 @@ "taille est dépassée" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Ajouter le commentaire de source suivant :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Ajouter \"source=...\" aux éléments ?" @@ -10663,5 +10856,4 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 -#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" @@ -10669,6 +10861,4 @@ "projections and retry" msgstr "" -"Pour activer le greffon WMS du cadastre, changez\n" -"la projection actuelle vers une du cadastre et réessayez." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 @@ -10688,7 +10878,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "chargement de l’image..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10734,7 +10923,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Sélectionner" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10825,5 +11013,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 "Calque vide" @@ -11789,18 +11977,18 @@ msgstr "Etat du problème inconnu" -#: ../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 "Open Visible..." -#: ../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 "Ouvrir uniqueent les fichiers visibles sur la vue actuelle." -#: ../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 "Aucune vue ouverte - impossible de déterminer la zone !" -#: ../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}" @@ -11811,5 +11999,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11819,9 +12007,9 @@ "carte des Préférences." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "options osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Exécutable Firefox" @@ -11832,29 +12020,34 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Créer un nouveau nœud." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "Changer la sélection" -#: ../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 "changer le viewport" -#: ../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 "confirmez toutes les actions Remote Control manuellement" -#: ../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 "" "Un greffon permettant à JOSM d’être contrôlé par d’autres applications." -#: ../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 "Remote Control" -#: ../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 "Réglages du greffon Remote Control" -#: ../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 " @@ -11866,28 +12059,35 @@ "dialogant avec le greffon." -#: ../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 "Actions permises" -#: ../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 "Il a été demandé à Remote Control de charger les données depuis l'API." -#: ../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 "Request details: {0}" -#: ../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 "Voulez-vous permettre celà?" -#: ../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 "Confirmer l’action Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Il a été demandé à Remote Control de charger les données depuis l'API." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -12394,25 +12594,33 @@ "Veuillez vérifier qu'aucune erreur n'a été introduite." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Entrer des valeurs pour tous les conflits." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Résoudre les conflits" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Corriger les conflits d'étiquettes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Élément supprimé des relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Aires jointes: enlever les voies courtes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Chemin fermé" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Supprime les étiquettes des chemins internes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Fonction de jointure des zones" @@ -12488,6 +12696,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 "Erreurs de validation" @@ -12497,10 +12705,10 @@ msgstr "Aucune erreur de validation" -#: ../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 "Grille" -#: ../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 "" @@ -12593,51 +12801,66 @@ msgstr "Validation des données" -#: ../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 "Les données contiennent des erreurs. Envoyer quand même ?" -#: ../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 "Ouvrir la fenêtre de validation." -#: ../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 "Zoomer sur le problème" -#: ../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 "Réparer" -#: ../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 "Résoudre l'erreur sélectionné" -#: ../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 "Ignorer" -#: ../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 "Ignorer les erreurs sélectionnées à l'avenir." -#: ../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 "Groupe complet" -#: ../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 "Eléments seuls" -#: ../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 "Rien" -#: ../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 "Ignorer le groupe complet ou les éléments individuels ?" -#: ../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 "Ignore les éléments" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Attends 10 secondes… " + +#: ../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 "Mise à jour des données" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12663,16 +12886,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent " -"sur le même calque sans être connectés par un nœud." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Créer les bêtiments" +msgstr "Bâtiments chevauchants" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12680,20 +12899,19 @@ msgstr "Chemins se croisant" -#: ../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 "Nœuds dupliqués" -#: ../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 "" "Ce test vérifie si des nœuds ne sont pas exactement à la même position." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Nœuds avec le même nom." - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "Nœuds à la même position" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Confirmation" @@ -12701,20 +12919,18 @@ #: ../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 "Chemin dupliqué" +msgstr "Chemins dupliqués" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." msgstr "" -"Ce test vérifie si des nœuds ne sont pas exactement à la même position." +"Ce test vérifie qu'il n'existe pas deux chemins avec les mêmes tags et les " +"coordonnées de nœuds." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Créer un chemin dupliqué" +msgstr "Supprimer les chemins dupliqués." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13308,5 +13524,5 @@ msgstr "Intersection atteinte" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Une exception s’est produite" @@ -13413,5 +13629,5 @@ msgstr "Ajouter l'Image rectifiée" -#: ../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 " @@ -13421,5 +13637,5 @@ "Veuillez réessayer." -#: ../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 "Pas d’URL WMS valide ou d’id" @@ -13437,17 +13653,17 @@ msgstr "Veuillez sélectionner le calque WMS à ajuster." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "Sélectionnez le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Commencer à ajuster" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "Il n'y a actuellement pas de calque WMS à ajuster." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "Pas de calque à ajuster." @@ -13465,4 +13681,6 @@ "settings." msgstr "" +"Attention : la récupération de dalles WMS risque d'échouer. Veuillez " +"vérifier vos réglages de préférences." #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 @@ -13490,19 +13708,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "désigné" - -#: ../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 "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../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 "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13513,14 +13730,13 @@ 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 -#, fuzzy +msgstr "Oui, récupérer les images" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Date non valide" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "URL invalide ?" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13529,37 +13745,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Charger la couche WMS" -#: ../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}" @@ -13568,66 +13784,77 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Ouvrir un calque WMS vide pour charger des données depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Préférences du greffon WMS" -#: ../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 "" "Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS" -#: ../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 "Nom du menu" -#: ../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 "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Nom du menu (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "URL de WMS (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Entrer un nom pour le menu et un URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Copier les valeurs par défaut" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Veuillez sélectionner au moins un chemin." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "Veuillez sélectionner au moins une ligne à copier." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Outil de téléchargement :" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Tuiles se chevauchant" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% de lat. :" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% de lat. :" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "fichiers TCX (*.tcx)" +msgstr "Fichiers WMS (*.wms)" #. * @@ -14045,5 +14272,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 "Référence" @@ -14585,7 +14812,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Châlet" +msgstr "Asphalte" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14606,8 +14832,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 "Location" +msgstr "Métal" #. color heath @@ -14625,5 +14850,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 "bois" @@ -14636,7 +14862,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parking_tickets" +msgstr "Pavés" #. item "Ways/Track Grade 2" combo "Surface" @@ -14672,7 +14897,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "pavés" +msgstr "Graviers" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14683,7 +14907,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incomplet" +msgstr "Compact" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14694,7 +14917,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "herbe" +msgstr "Herbe" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14888,4 +15110,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" @@ -14914,12 +15137,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 "oui" #. color permissive -#. +#. #. 1 #. 40000 @@ -14967,5 +15190,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -15002,5 +15225,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -15064,6 +15287,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 "non" @@ -15209,6 +15433,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 "Type" @@ -15479,7 +15703,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Rue Piétonne" +msgstr "Piétons" #. item "Ways/Cycleway" text "Width (meters)" @@ -15498,7 +15721,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pointes" +msgstr "Vélos" #. item "Ways/Footway" text "Width (meters)" @@ -15790,7 +16012,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 "Compagnie" @@ -16003,6 +16225,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 "Altitude" @@ -16252,10 +16474,10 @@ #: build/trans_presets.java:1022 msgid "Turnstile" -msgstr "" +msgstr "Tourniquet" #. item #: build/trans_presets.java:1023 msgid "Edit Turnstile" -msgstr "" +msgstr "Éditer tourniquet" #. item "Barriers/Turnstile" check "Bicycle" @@ -16914,7 +17136,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" @@ -16962,23 +17181,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 "Horaires d’ouverture" @@ -17002,5 +17221,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" @@ -17047,24 +17265,24 @@ #: 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 "" +msgstr "24h/24 7j/7" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -17077,24 +17295,24 @@ #: 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 "" +msgstr "Lun-ven 08:30-20:00" #: build/trans_presets.java:1383 build/trans_presets.java:1621 @@ -17107,24 +17325,24 @@ #: 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 "" +msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00" #. group "Bicycle" @@ -17156,5 +17374,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 "Numéro de référence" @@ -17174,7 +17392,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Automobiles en libre service" +msgstr "Parking relais" #. item "Tourism/Information Terminal" text "Reference number" @@ -17188,7 +17405,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Capacité" +msgstr "Capacité (globale)" #. item "Car/Parking" text "Capacity (overall)" @@ -17198,16 +17414,14 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Espaces pour handicapés" +msgstr "Emplacements pour femmes" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Espaces pour handicapés" +msgstr "Emplacements pour parents" #: build/trans_presets.java:1400 msgid "See the Wiki for other capacity:[types]=*." -msgstr "" +msgstr "Voir le Wiki pour les autres types de capacité : [types]=*." #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." @@ -17405,5 +17619,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Abri" @@ -17788,7 +18002,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17831,28 +18044,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chinois" +msgstr "Schéma" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Télécharger zone" +msgstr "Zone affichée" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Coller" +msgstr "Site" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Ville de plus de 100 000 habitants" +msgstr "Ville" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "régional" +msgstr "Région" #. item "Tourism/Other Information Points" text "Name" @@ -17868,5 +18076,5 @@ #: build/trans_presets.java:1724 build/trans_presets.java:1747 msgid "Routes shown for:" -msgstr "" +msgstr "Routes affichées pour :" #. item "Tourism/Map" check "Hiking" @@ -17880,7 +18088,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Chemin de randonnée en montagne" +msgstr "VTT" #. item "Tourism/Map" check "Mountainbiking" @@ -17894,7 +18101,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "voie de garage" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17902,5 +18108,5 @@ #: build/trans_presets.java:1730 build/trans_presets.java:1753 msgid "... other transportation modes possible" -msgstr "" +msgstr "... autres modes de transport possibles" #. item "Tourism/Map" label "... other transportation modes possible" @@ -17911,13 +18117,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Douane" +msgstr "Contenu du panneau" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "verte" +msgstr "Remarque" #: build/trans_presets.java:1737 @@ -17934,40 +18138,34 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "utilisation du terrain" +msgstr "Usines" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Panneau de direction (randonnée)" +msgstr "Poteau indicateur" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Information" +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 "Description détaillée" +msgstr "Description précise" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "Guide audio" #. #: build/trans_presets.java:1775 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "Guide audio via téléphone mobile ?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" msgstr "Numéro de téléphone" @@ -18293,5 +18491,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18325,5 +18523,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19449,6 +19647,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 "Religion" @@ -19457,66 +19655,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 "bahai" -#: 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 "buddhist" -#: 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 "christian" -#: 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 "jain" -#: 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 "jewish" -#: 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 "muslim" -#: 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 "unitarisme" -#: 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 "zoroastrian" -#: 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 "Dénomination" @@ -19525,76 +19723,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 "anglican" -#: 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 "catholique" -#: 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 "evangelical" -#: 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 "jehovahs_witness" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" @@ -19926,5 +20124,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 "Note" @@ -19949,5 +20147,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 "Pièces" @@ -19955,5 +20153,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 "Billets" @@ -19961,5 +20159,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 "Cartes de crédit temporaire" @@ -19967,5 +20165,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 "Cartes de débit" @@ -19973,5 +20171,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 "Cartes de crédits" @@ -20030,10 +20228,144 @@ msgstr "Banc" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Retour" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Mémorial" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "rien" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "lieu" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Couleur" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Retour" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "bas" + +#. 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 "espace vert" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "fin" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valeur" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "Site" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Nombre de câbles" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" @@ -20042,30 +20374,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 "Hauteur" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "faible" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "à moitié" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "complet" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Masquer" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Verrouiller" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontaine" @@ -20074,10 +20406,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Eau potable" @@ -20086,10 +20418,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -20097,35 +20429,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarché" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Châlet" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Editez un châlet" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -20133,9 +20463,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -20143,29 +20473,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "Librairie" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Éditer un arrêt de bus" - -#: build/trans_presets.java:2498 +msgstr "Éditer librairie" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "Agence de voyage" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Éditer un arbre isolé" - -#: build/trans_presets.java:2504 +msgstr "Éditer agence de voyage" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Distributeur automatique" @@ -20173,5 +20501,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -20179,88 +20507,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "food" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Boucherie" @@ -20268,9 +20596,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Boulanger" @@ -20278,9 +20606,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Fleuriste" @@ -20288,18 +20616,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Modifier fleuriste" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Boutique bio" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alcool" @@ -20307,54 +20635,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Boissons" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Informatique" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Électronique" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Ameublement" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Jardinerie" @@ -20362,9 +20690,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Quincaillerie" @@ -20372,9 +20700,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -20382,54 +20710,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Papeterie" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Coiffeur" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Magasin de chaussures" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Jouets" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Vidéoclub" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Pressing" @@ -20437,9 +20765,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Laverie libre-service" @@ -20447,9 +20775,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Éditer une laverie" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -20457,32 +20785,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Sports" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Opticien" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Modifier opticien" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banque" @@ -20490,14 +20818,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Editez une banque" -#: 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 "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Bureau de change" @@ -20505,5 +20833,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -20511,15 +20839,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Médecin" @@ -20527,18 +20855,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Modifier Médecin" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dentiste" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Pharmacie" @@ -20546,5 +20874,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -20552,9 +20880,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Dispensaire" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hôpital" @@ -20562,10 +20890,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -20574,5 +20902,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -20581,20 +20909,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Numéro de téléphone" #. 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 "(Utiliser le code international, comme +12-345-67890" @@ -20602,5 +20930,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 "Vétérinaire" @@ -20609,55 +20937,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Pays" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Éditer un pays" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Département" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Éditer un état" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Région" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Éditer une région" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Comté/Canton" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -20665,15 +20993,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Editez la ville" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -20681,10 +21009,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Editez la ville" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Banlieue" @@ -20692,25 +21020,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Éditer un village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Hameau" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -20718,5 +21046,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Lieu-dit" @@ -20724,10 +21052,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "île" @@ -20735,24 +21063,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Éditer une île" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "gauche" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Editez un châlet" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -20760,10 +21086,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Sommet" @@ -20771,10 +21097,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Glacier" @@ -20782,10 +21108,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Volcan" @@ -20793,70 +21119,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nationale" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politique" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Parc national" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Arbre" @@ -20865,15 +21191,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Bois" @@ -20882,5 +21208,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Éditer un bois" @@ -20888,17 +21214,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 "coniferous" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Forêt" @@ -20907,14 +21233,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -20922,25 +21248,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Zone d’éboulements" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Broussailles" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Talus" @@ -20948,10 +21274,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Lande" @@ -20959,5 +21285,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Éditer une lande" @@ -20965,5 +21291,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -20972,45 +21298,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Terrains de ferme" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Prairie" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vigne" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Jardins familiaux" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -21018,25 +21344,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Jardin" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Herbe" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Zone publique herborée" @@ -21044,10 +21370,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Espace commun" @@ -21055,20 +21381,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Parc" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -21076,5 +21402,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -21082,15 +21408,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Zone résidentielle" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Petit cimetière" @@ -21098,9 +21424,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cimetière" @@ -21108,39 +21434,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Zone commerciale" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Bureaux" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Zone industrielle" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Zone ferroviaire" @@ -21148,15 +21474,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militaire" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -21164,55 +21490,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Zone de construction" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Terrain en friche" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Espace vert" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Décharge" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Carrière" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multypoligone" @@ -21222,5 +21548,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 "Modifier un multipolygone" @@ -21229,10 +21555,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "segment intérieur" @@ -21240,5 +21566,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -21247,5 +21573,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -21253,34 +21579,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -21289,15 +21615,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "nœud ou chemin de passage" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "chemin destination" @@ -21305,5 +21631,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Route" @@ -21312,5 +21638,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Modifier une route" @@ -21318,5 +21644,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Type de route" @@ -21324,5 +21650,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21388,5 +21714,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 @@ -21395,17 +21721,17 @@ msgstr "vélo/bicyclette" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "route" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ski" @@ -21458,5 +21784,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 @@ -21465,13 +21791,13 @@ msgstr "piéton" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "détour" @@ -21485,10 +21811,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Description du symbole" @@ -21496,31 +21822,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "Route state" -msgstr "" +msgstr "État de la route" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -21529,30 +21855,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -24705,76 +25031,4 @@ msgstr "patrimoine" -#. 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 "espace vert" - #. color green #. @@ -25742,116 +25996,63 @@ msgstr "Terraserver Urbain" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Toutes les voies étaient vides" + +#~ msgid "Merge nodes with different memberships?" #~ msgstr "" -#~ "Indication : Certains changements viennent de l’envoi de nouvelles " -#~ "données sur le serveur." - -#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" + +#~ msgid "Merge Anyway" +#~ msgstr "Fusionner tout de même" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Veuillez sélectionner des chemins avec des angles droits afin de les " -#~ "orthogonaliser." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. " +#~ "Voulez-vous encore les fusionner ?" + +#~ msgid "Unknown version" +#~ msgstr "Version inconnue" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Il manque le numéro de version dans les données OSM." + +#~ msgid "Found element in non-way." +#~ msgstr "Élément trouvé sur un non-chemin." + +#~ msgid " has zero ref" +#~ msgstr " n’a pas de ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Élément trouvé dans une non-relation." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "" -#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier " -#~ "plan. L'exception était : {0}" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. " -#~ "Merci de signaler ceci comme une erreur." +#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation " +#~ "{1}, valeur {2}" + +#~ msgid "Ill-formed node id" +#~ msgstr "id du nœud mal formé" + +#~ msgid "Move" +#~ msgstr "Déplacer" + +#~ msgid "Data Layer" +#~ msgstr "Calque de données" #~ msgid "No document open so nothing to save." #~ msgstr "Aucun document ouvert donc rien à sauvegarder." - -#~ msgid "Change {0} {1}" -#~ msgstr "Changer {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Supprimer {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "supprimer le membre de la relation {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" - -#~ msgid "nodes" -#~ msgstr "nœuds" - -#~ msgid "ways" -#~ msgstr "chemins" - -#~ msgid "relations" -#~ msgstr "relations" - -#~ msgid "changesets" -#~ msgstr "jeux de données" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Impossible de charger l’historique depuis le serveur. Détails :
" -#~ "{0}" - -#~ msgid "Delete Layer" -#~ msgstr "Supprimer le calque" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Tout supprimer" - -#~ msgid "Authors: {0}" -#~ msgstr "Auteurs : {0}" - -#~ msgid "Public" -#~ msgstr "Public" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " -#~ "charger." - -#~ msgid "Continue anyway" -#~ msgstr "Continuer tout de même" - -#~ msgid "Copy Default" -#~ msgstr "Copier défaut" - -#~ msgid "Edit Information Office" -#~ msgstr "Modifier Office du Tourisme" - -#~ msgid "Map Type" -#~ msgstr "Type de carte" - -#~ msgid "map" -#~ msgstr "carte" - -#~ msgid "citymap" -#~ msgstr "carte de la ville" - -#~ msgid "hikingmap" -#~ msgstr "carte de randonnée" - -#~ msgid "bicyclemap" -#~ msgstr "carte de randonnée cycliste" - -#~ msgid "Board Type" -#~ msgstr "Type de bureau" - -#~ msgid "board" -#~ msgstr "tableau" - -#~ msgid "Move" -#~ msgstr "Déplacer" - -#~ msgid "Data Layer" -#~ msgstr "Calque de données" #~ msgid "Unknown file extension." @@ -25927,18 +26128,8 @@ #~ msgstr "EPSG:4326" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom : molette de souris ou double-clic. Déplacer la carte : garder le " -#~ "bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" - #~ msgid "Validate either current selection or complete dataset." #~ msgstr "" #~ "Valider soit la sélection actuelle, soit toutes les données téléchargées." -#~ msgid "end" -#~ msgstr "fin" - #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -25967,4 +26158,9 @@ #~ msgid "Add Selected" #~ msgstr "Ajouter la sélection" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indication : Certains changements viennent de l’envoi de nouvelles " +#~ "données sur le serveur." #~ msgid "Tags (empty value deletes tag)" @@ -25985,4 +26181,7 @@ #~ msgstr "Pivoter" +#~ msgid "Delete {1} {0}" +#~ msgstr "Supprimer {1} {0}" + #~ msgid "Error parsing server response." #~ msgstr "Erreur d'analyse de la réponse du serveur" @@ -26000,9 +26199,32 @@ #~ msgstr "Importer un fichier TCX..." +#~ msgid "Copy Default" +#~ msgstr "Copier défaut" + +#~ msgid "citymap" +#~ msgstr "carte de la ville" + +#~ msgid "map" +#~ msgstr "carte" + #~ msgid "Charge" #~ msgstr "Charge" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Veuillez sélectionner des chemins avec des angles droits afin de les " +#~ "orthogonaliser." + #~ msgid "Drawbridge" #~ msgstr "Pont-levis" + +#~ msgid "hikingmap" +#~ msgstr "carte de randonnée" + +#~ msgid "bicyclemap" +#~ msgstr "carte de randonnée cycliste" + +#~ msgid "board" +#~ msgstr "tableau" #~ msgid "Server does not support changesets" @@ -26076,4 +26298,7 @@ #~ msgstr "Herse" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" + #~ msgid "" #~ "The plugin {0} seems to be broken or could not be downloaded " @@ -26107,4 +26332,7 @@ #~ "{0}" +#~ msgid "Authors: {0}" +#~ msgstr "Auteurs : {0}" + #~ msgid "Conflicts: {0}" #~ msgstr "Conflits : {0}" @@ -26128,4 +26356,10 @@ #~ msgid "sports" #~ msgstr "Magasin de sport" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Public" #~ msgid "Select Tableau d'Assemblage" @@ -26154,6 +26388,14 @@ #~ msgstr "Supprimer et télécharger" +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " +#~ "charger." + #~ msgid "No intersections found. Nothing was changed." #~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié." + +#~ msgid "Continue anyway" +#~ msgstr "Continuer tout de même" #~ msgid "Commit comment" @@ -26173,8 +26415,4 @@ #~ msgid "Add all currently selected objects as members" #~ msgstr "Ajouter les objets sélectionnés en tant que membres" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "" -#~ "Supprimer le membre de cette relation de l'entrée actuelle de la table" #~ msgid "Click Reload to refresh list" @@ -26191,4 +26429,7 @@ #~ "préalablement sélectionnée dans la liste de l’historique." +#~ msgid "Delete Layer" +#~ msgstr "Supprimer le calque" + #~ msgid "Layers: {0}" #~ msgstr "Calques: {0}" @@ -26202,4 +26443,11 @@ #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. " +#~ "Merci de signaler ceci comme une erreur." #~ msgid "Adjust the position of the WMS layer" @@ -26246,4 +26494,13 @@ #~ msgstr "" #~ "Les erreurs suivantes sont survenues durant le téléchargement groupé :" + +#~ msgid "Edit Information Office" +#~ msgstr "Modifier Office du Tourisme" + +#~ msgid "Map Type" +#~ msgstr "Type de carte" + +#~ msgid "Board Type" +#~ msgstr "Type de bureau" #~ msgid "Edit Drawbridge" @@ -26320,10 +26577,4 @@ #~ msgstr "lié" -#~ msgid "Overlap tiles" -#~ msgstr "Tuiles se chevauchant" - -#~ msgid "% of lat:" -#~ msgstr "% de lat. :" - #~ msgid "% of lon:" #~ msgstr "% de lon. :" @@ -26400,4 +26651,16 @@ #~ msgstr "Primitive manquante" +#~ msgid "nodes" +#~ msgstr "nœuds" + +#~ msgid "ways" +#~ msgstr "chemins" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "changesets" +#~ msgstr "jeux de données" + #~ msgid "Error when communicating with server." #~ msgstr "Erreur de communication avec le serveur" @@ -26429,4 +26692,12 @@ #~ msgstr "Échec d’initialisation de l’API" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Impossible de charger l’historique depuis le serveur. Détails :
" +#~ "{0}" + +#~ msgid "Change {0} {1}" +#~ msgstr "Changer {0} {1}" + #~ msgid "No data" #~ msgstr "Aucune donnée" @@ -26434,2 +26705,16 @@ #~ msgid "Conflict created" #~ msgstr "conflit créé" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "supprimer le membre de la relation {0} {1}" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Tout supprimer" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier " +#~ "plan. L'exception était : {0}" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 17594) +++ /applications/editors/josm/i18n/po/gl.po (revision 17595) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" "PO-Revision-Date: 2009-06-27 15:34+0000\n" "Last-Translator: Dirk Stöcker \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:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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 "Axuda" -#: ../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 "" -#: ../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 "Erro" -#: ../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] "Hai cambios sen gardar. Descartar os cambios e continuar?" -msgstr[1] "Hai cambios sen gardar. Descartar os cambios e continuar?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Cambios non gardados" -#: ../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 "Gardar e Sair" -#: ../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 "Descartar e Sair" -#: ../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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{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 "" -#: ../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 "Ignorando URL de ficheiro mal formada: \"{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 "Engadidos" @@ -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 "Información" @@ -548,5 +550,5 @@ msgstr "Por favor, selecciona polo menos tres nodos." -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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,75 +633,59 @@ msgstr "Non hai conflitos sobre os que facer zoom" -#: ../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 "Combinar vía" -#: ../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 "Combinar varias vías en unha." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Combinar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Cambiar direccións?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Invertir e Combinar" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"As vías non poden ser combinadas coas súas direccións actuais. Queres " +"invertir algunhas?" + +#: ../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 "" +"Non se puideron combinar as vías (Non puideron ser acopladas nunha única " +"serie de nodos)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Combinar {0} vías" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Combinar de todas formas" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Cambiar direccións?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Invertir e Combinar" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"As vías non poden ser combinadas coas súas direccións actuais. Queres " -"invertir algunhas?" - -#: ../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 "Introducir valores para todos os conflitos." - -#: ../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 "Resolver Conflitos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Combinar {0} vías" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Todas as vías están vacías" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Non se puideron combinar as vías (Non puideron ser acopladas nunha única " -"serie de nodos)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -753,5 +739,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 "Borrar" @@ -761,15 +747,15 @@ msgstr "Borrar obxectos seleccionados." -#: ../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 "Sobrescribir" -#: ../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 "O ficheiro existe. Sobrescribir?" @@ -799,10 +785,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}" @@ -833,5 +819,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 @@ -1010,1064 +996,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 "Acoplar Nodos" -#: ../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 "Acoplar nodos no máis antigo" -#: ../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 "Por favor, selecciona polo menos dous nodos a acoplar." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Acoplar de todas formas" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en " -"uso." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Acoplar {0} nodos" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Reflexar" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Reflexar os nodos e vías seleccionados." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Por favor, seleccione como mínimo un nodo ou vía." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "arriba" - -#: ../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 "Mover obxectos {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "abaixo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "esquerda" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "dereita" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Mover {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Move Obxectos {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 "Non se poden mover objectos fora do mundo." - -#: ../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 "Nova" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Crear un novo mapa." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Abrir..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Abrir un ficheiro." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Abrir un ficheiro." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Papel \"{0}\" descoñecido." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Abrir Lugar..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Abrir unha URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Capa Distinta" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Introducir URL a descargar:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Descargar Lugar" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Descargar URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ortogonalizar Forma" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "So se permiten dous nodos" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "A selección debe estar formada só por vías." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." - -#: ../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 "Só hai un nodo seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ortogonalizar" - -#: ../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 "Pegar" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Pegar contidos ó buffer de pegado." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Pegar Etiquetas" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Aplicar as etiquetas dos contidos do buffer de pegado a todos os elementos " -"seleccionados." - -#: ../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] "Desfacer o borrado de {0} primitivas" -msgstr[1] "Desfacer o borrado de {0} primitivas" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferencias..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Abrir unha páxina de preferencias para a configuración global." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferencias" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Refacer" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Refacer a última acción desfeita." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Renomear capa" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Renomear tamén o ficheiro" - -#: ../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 "Invertir Vías" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Invertir a dirección de todas as vías seleccionadas." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Por favor, selecciona polo menos unha vía." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Invertir vías" - -#: ../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 "Gardar" - -#: ../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 "Gardar os datos actuais." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "O arquivo {0} existe. Sobreescribir?" - -#: ../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 "Documento valeiro" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "O documento non contén datos." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Gardar de todas formas" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflitos" - -#: ../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 "" -"Hai conflitos sen resolver. Os conflitos non serán gardados e serán tratados " -"como se os rexeitases todos. Continuar?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Rexeitar Conflitos e Gardar" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Gardar ficheiro OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Gardar ficheiro GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Gardar Capa" - -#: ../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 "Gardar como..." - -#: ../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 "Gardar os datos actuais nun novo ficheiro." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Seleccionar Todo" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Seleccionar todos os obxectos sen borrar da capa de datos. Isto selecciona " -"tamén os obxectos incompletos." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Amosar Informe de Estado" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Amosar informe de estado con información de utilidade que poida ser engadida " -"ós erros" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Axda: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Informe de Estado" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copiar a porta papeis e pechar" - -#: ../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 "Pechar" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Separar Vía" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Separar unha vía no nodo seleccionado." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "A selección actual non pode ser usada para a separación." - -#: ../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] "O nodo seleccionado non está no medio de ningunha vía." -msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía." - -#: ../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] "" -"Hai máis de unha vía usando o nodo que seleccionaches. Por favor, selecciona " -"tamén a vía." -msgstr[1] "" -"Hai máis de unha vía usando os nodos que seleccionaches. Por favor, " -"selecciona tamén a vía." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Os nodos seleccionados non comparten a mesma vía." - -#: ../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] "A via seleccionada non contén o nodo seleccionado." -msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados." - -#: ../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 "Debes seleccionar dous ou máis nodos para separar unha vía circular." - -#: ../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 "" -"A vía non pode ser separada nos nodos seleccionads. (Consello: Selecciona " -"nodos no medio da vía.)" - -#: ../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 "Separar a vía {0} en {1} partes" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Pechando colección de cambios..." - -#: ../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 "Pechando colección de cambios..." - -#: ../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 "Pechando colección de cambios..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Pechando colección de cambios..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Cambiar Liñas GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Debuxar liñas entre puntos gps sen procesar." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Cambia a configuración global \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Despegar Vías" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplicar nodos que son usados por múltiples vías." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Este nodo non está pegado a outra cousa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ningún destes nodos estan pegados a outra cousa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ningún dos nodos desta vía están pegados a outra cousa." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "A selección actual non pode ser usada para despegar." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Seleccionar ou ben:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Un nodo etiquetado, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Un nodo que está sendo usado por máis dunha vía, ou" - -#: ../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 "" -"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" - -#: ../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 "" -"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha " -"vía, ou" - -#: ../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 "" -"* Unha vía e un ou máis dos seus nodos que están sendo usados por máis dunha " -"vía." - -#: ../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 "" -"Nota: Se unha vía é seleccionada, esta vía obterá novas copias dos nodos\n" -"despegados e os novos nodos serán seleccionados. Se non, todas as vías\n" -"obterán as súas propias copias e todos os nodos serán seleccionados." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Despegar Nodo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Desfacer" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Desfacer a última acción." - -#: ../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 "Deseleccionar Todo" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Deseleccionar todos os obxectos." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Deseleccionar Todo (Enfocar)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Deseleccionar Todo (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Actualizar Datos" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)" - -#. 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 "" - -#: ../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 "Actualizar Selección" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Non hai primitivas seleccionadas para actualizar." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Selección valeira" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Subir a OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "SIbir todos os cambios ó servidor OSM." - -#: ../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 "Hai conflitos sen resolver. Debes resolver estes antes." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nada que subir. Consigue algún dato antes." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Non hai cambios que subir." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Sincronizar só {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 "Sincronizar o paquete de datos completo" - -#: ../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 "" -"A actualización fallou porque o servidor ten unha " -"nova versión de un
dos teus nodos, vías ou relacións.
O conflito foi " -"causado polo/a {0} con id {1},
o " -"servidor ten a versión {2}, a túa versión é a {3}.

Fai click en " -"{4} para sincronizar só a primitiva conflitiva.
Fai " -"click en {5} para sincronizar o paquete de datos local " -"completo co servidor.
Fai click en {6} para abortar e " -"continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Detectado un conflito" - -#. 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 "valor retornado non esperado. Obtívose {0}" - -#: ../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 "" -"A subida fallou porque o servidor tiña unha versión " -"máis recente de un
dos teus nodos, vías ou relacións.

Fai click en " -"{0} para sincronizar o paquete de datos local completo co " -"servidor.
Fai click en {1} para abortar e continuar " -"editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}" -"\"" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Subir estes cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Subir Cambios" - -#: ../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 "Engadir un novo nodo a unha via existente" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Proporciona un breve comentario para os cambios que vas a subir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Preferencias do Mapa" - -#: ../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 "Obxectos para engadir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Obxectos para modificar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Obxectos para borrar:" - -#: ../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] "Obxectos para engadir:" -msgstr[1] "Obxectos para engadir:" - -#: ../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] "Obxectos para modificar:" -msgstr[1] "Obxectos para modificar:" - -#: ../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] "Obxectos para borrar:" -msgstr[1] "Obxectos para borrar:" - -#: ../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 "Último cambio en {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Aumentar Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Reducir Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Atrais" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Saltar cara atrais." - -#: ../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 "Máis rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Avance máis rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Avance" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Saltar cara adiante" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Marca Seguinte" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Reproducir a seguinte marca." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Reproducción/Pausa" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Reproducir/Pausar audio." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Marca Anterior" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Reproducir a marca anterior." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Máis lento" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Avance máis lento" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Descargando datos GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Datos GPX Descargados" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Datos GPS en bruto" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Descargando datos" - -#: ../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 "Non se importaron datos." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Datos OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Descarga {0} de {1} ({2} restantes)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Erros durante a descarga" - -#: ../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 "Primitivas borradas ou movidas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Borrar Modo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Borrar nodos ou vías." - -#: ../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 "Modo: {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 "" -"Facer click para borrar. Maiúsculas: borrar segmento de vía. Alt: Non borrar " -"nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." - +#: ../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 @@ -2078,7 +1025,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 @@ -2087,6 +1035,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 @@ -2117,4 +1065,910 @@ msgstr "o parámetro \"{0}\" debe non ser nulo" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en " +"uso." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Acoplar {0} nodos" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Reflexar" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Reflexar os nodos e vías seleccionados." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Por favor, seleccione como mínimo un nodo ou vía." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "arriba" + +#: ../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 "Mover obxectos {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "abaixo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "esquerda" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "dereita" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Mover {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Move Obxectos {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 "Non se poden mover objectos fora do mundo." + +#: ../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 "Nova" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Crear un novo mapa." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Abrir..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Abrir un ficheiro." + +#: ../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 "Abrir Lugar..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Abrir unha URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Capa Distinta" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Introducir URL a descargar:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Descargar Lugar" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Descargar URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ortogonalizar Forma" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "So se permiten dous nodos" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "A selección debe estar formada só por vías." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." + +#: ../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 "Só hai un nodo seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ortogonalizar" + +#: ../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 "Pegar" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Pegar contidos ó buffer de pegado." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Pegar Etiquetas" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Aplicar as etiquetas dos contidos do buffer de pegado a todos os elementos " +"seleccionados." + +#: ../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 "Preferencias..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Abrir unha páxina de preferencias para a configuración global." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferencias" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Refacer" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Refacer a última acción desfeita." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Renomear capa" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Renomear tamén o ficheiro" + +#: ../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 "Invertir Vías" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Invertir a dirección de todas as vías seleccionadas." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Por favor, selecciona polo menos unha vía." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Invertir vías" + +#: ../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 "Gardar" + +#: ../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 "Gardar os datos actuais." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "O arquivo {0} existe. Sobreescribir?" + +#: ../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 "Documento valeiro" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Gardar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "O documento non contén datos." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflitos" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Rexeitar Conflitos e Gardar" + +#: ../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 "" +"Hai conflitos sen resolver. Os conflitos non serán gardados e serán tratados " +"como se os rexeitases todos. Continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Gardar ficheiro OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Gardar ficheiro GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Gardar Capa" + +#: ../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 "Gardar como..." + +#: ../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 "Gardar os datos actuais nun novo ficheiro." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Seleccionar Todo" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Seleccionar todos os obxectos sen borrar da capa de datos. Isto selecciona " +"tamén os obxectos incompletos." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Amosar Informe de Estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Amosar informe de estado con información de utilidade que poida ser engadida " +"ós erros" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Axda: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Informe de Estado" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copiar a porta papeis e pechar" + +#: ../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 "Pechar" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Separar Vía" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Separar unha vía no nodo seleccionado." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "A selección actual non pode ser usada para a separación." + +#: ../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] "O nodo seleccionado non está no medio de ningunha vía." +msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía." + +#: ../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] "" +"Hai máis de unha vía usando o nodo que seleccionaches. Por favor, selecciona " +"tamén a vía." +msgstr[1] "" +"Hai máis de unha vía usando os nodos que seleccionaches. Por favor, " +"selecciona tamén a vía." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Os nodos seleccionados non comparten a mesma vía." + +#: ../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] "A via seleccionada non contén o nodo seleccionado." +msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados." + +#: ../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 "Debes seleccionar dous ou máis nodos para separar unha vía circular." + +#: ../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 "" +"A vía non pode ser separada nos nodos seleccionads. (Consello: Selecciona " +"nodos no medio da vía.)" + +#: ../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 "Separar a vía {0} en {1} partes" + +#: ../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 "Cambiar Liñas GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Debuxar liñas entre puntos gps sen procesar." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Cambia a configuración global \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Despegar Vías" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplicar nodos que son usados por múltiples vías." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Este nodo non está pegado a outra cousa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ningún destes nodos estan pegados a outra cousa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ningún dos nodos desta vía están pegados a outra cousa." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "A selección actual non pode ser usada para despegar." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Seleccionar ou ben:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Un nodo etiquetado, ou" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Un nodo que está sendo usado por máis dunha vía, ou" + +#: ../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 "" +"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" + +#: ../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 "" +"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha " +"vía, ou" + +#: ../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 "" +"* Unha vía e un ou máis dos seus nodos que están sendo usados por máis dunha " +"vía." + +#: ../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 "" +"Nota: Se unha vía é seleccionada, esta vía obterá novas copias dos nodos\n" +"despegados e os novos nodos serán seleccionados. Se non, todas as vías\n" +"obterán as súas propias copias e todos os nodos serán seleccionados." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Despegar Nodo" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Desfacer" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Desfacer a última acción." + +#: ../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 "Deseleccionar Todo" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Deseleccionar todos os obxectos." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Deseleccionar Todo (Enfocar)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Deseleccionar Todo (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Actualizar Datos" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)" + +#. 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 "" + +#: ../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 "Actualizar Selección" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Non hai primitivas seleccionadas para actualizar." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Selección valeira" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Subir a OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "SIbir todos os cambios ó servidor OSM." + +#: ../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 "Nada que subir. Consigue algún dato antes." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Non hai cambios que subir." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Sincronizar só {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 "Sincronizar o paquete de datos completo" + +#: ../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 "" +"A actualización fallou porque o servidor ten unha " +"nova versión de un
dos teus nodos, vías ou relacións.
O conflito foi " +"causado polo/a {0} con id {1},
o " +"servidor ten a versión {2}, a túa versión é a {3}.

Fai click en " +"{4} para sincronizar só a primitiva conflitiva.
Fai " +"click en {5} para sincronizar o paquete de datos local " +"completo co servidor.
Fai click en {6} para abortar e " +"continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Detectado un conflito" + +#. 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 "valor retornado non esperado. Obtívose {0}" + +#: ../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 "" +"A subida fallou porque o servidor tiña unha versión " +"máis recente de un
dos teus nodos, vías ou relacións.

Fai click en " +"{0} para sincronizar o paquete de datos local completo co " +"servidor.
Fai click en {1} para abortar e continuar " +"editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}" +"\"" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Actualizando primitiva" + +#: ../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 "Aumentar Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Reducir Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Atrais" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Saltar cara atrais." + +#: ../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 "Máis rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Avance máis rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Avance" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Saltar cara adiante" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Marca Seguinte" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Reproducir a seguinte marca." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Reproducción/Pausa" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Reproducir/Pausar audio." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Marca Anterior" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Reproducir a marca anterior." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Máis lento" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Avance máis lento" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Descargando datos GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Datos GPX Descargados" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Datos GPS en bruto" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Descargando datos" + +#: ../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 "Non se importaron datos." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Datos OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Descarga {0} de {1} ({2} restantes)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Erros durante a descarga" + +#: ../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 "Primitivas borradas ou movidas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Borrar Modo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Borrar nodos ou vías." + +#: ../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 "Modo: {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 "" +"Facer click para borrar. Maiúsculas: borrar segmento de vía. Alt: Non borrar " +"nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2230,18 +2084,18 @@ "audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." -#: ../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 "Seleccionar" -#: ../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 "Seleccionar, mover e rotar obxectos" -#: ../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" @@ -2250,17 +2104,17 @@ msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." -#: ../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 "" @@ -2270,5 +2124,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 "" @@ -2391,7 +2245,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - obxecto coa ID indicada" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2446,41 +2299,41 @@ msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Comezar Busca" -#: ../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 "Non se atoparon coincidencias para \"{0}\"" -#: ../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 "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../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 "Non se eliminou da selección buscando por \"{0}\"" -#: ../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 "Atopadas {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2494,14 +2347,14 @@ "{2}" -#: ../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 "" -#: ../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" @@ -2510,26 +2363,26 @@ "relación" -#: ../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 "Faltan argumentos para OR." -#: ../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 "Faltan argumentos para NOT." -#: ../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 "Esperabase parentese de peche." -#: ../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 "Número de parámetros incorrecto para o operador nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2540,5 +2393,5 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../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." @@ -2575,7 +2428,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Engadir nodo" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2585,52 +2438,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relacións: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Cambiar {0} obxecto" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Último cambio en {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Cambiar relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Eliminar \"{0}\" para {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Eliminar \"{0}\" para {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Eliminar \"{0}\" para {1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Establecer {0}={1} para {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Establecer {0}={1} para {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Establecer {0}={1} para {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2700,30 +2553,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] "Borrar {0} {1}" -msgstr[1] "Borrar {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] "Borrar Modo" -msgstr[1] "Borrar Modo" +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] "Borrar {0} {1}" -msgstr[1] "Borrar {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] "Borrar da relación" -msgstr[1] "Borrar da relación" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2737,20 +2590,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n" -"Borrar da relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"A selección \"{0}\" é usada pola relación \"{1}\".\n" -"Borrar da relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2761,5 +2610,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." @@ -2842,17 +2691,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2862,17 +2711,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Resolver conflitos de versión para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Resolver conflitos de versión para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Resolver conflitos de versión para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3010,11 +2859,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"O ficheiro de preferencias contiña erros. Creando copia de seguridade do " -"antigo a {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3081,5 +2928,5 @@ msgstr "E" -#: ../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 @@ -3087,21 +2934,46 @@ 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 "Requírese o parámetro {0} > 0. Obtívose {1}." -#: ../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 "o parámetro \"{0}\" debe non ser nulo" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../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 "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "valor retornado non esperado. Obtívose {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "valor retornado non esperado. Obtívose {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, java-format +msgid "version > 0 expected. Got {0}" msgstr "" @@ -3116,11 +2988,16 @@ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\"" -#: ../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 "" @@ -3174,9 +3051,9 @@ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" -#: ../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 "A vía de estilo de área non está pechada." -#: ../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." @@ -3185,118 +3062,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 "Membro vacío na relación." -#: ../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 "Membro \"{0}\" borrado na relación." -#: ../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 "Vía \"{0}\" con menos de dous puntos." -#: ../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 "Atopadas máis de unha vía \"desde\"." -#: ../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 "Atopadas máis de unha vía \"ata\"." -#: ../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 "Atopouse máis de un \"vía\"." -#: ../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 "Papel \"{0}\" descoñecido." -#: ../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 "Tipo de membro descoñecido para \"{0}\"." -#: ../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 "Non se atoparon vias \"desde\"." -#: ../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 "Non se atoparon vías \"ata\"." -#: ../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 "Ningún nodo o vía \"vía\" atopados." -#: ../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 "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" -#: ../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 "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." -#: ../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 "Non se atopou o estilo para a restrición {0}" -#: ../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 "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" -#: ../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 "Intersección entre as vías ''{0}'' e ''{1}''." -#: ../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 "A vía interior ''{0}'' está fóra." -#: ../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 "Sen etiquetar" -#: ../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 "texto" @@ -3319,5 +3196,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" @@ -3328,5 +3205,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" @@ -3337,5 +3214,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" @@ -3444,5 +3321,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "Vía férrea" @@ -3474,135 +3351,33 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Fallo ao iniciar comunicación co servidor OSM {0}.\n" -"Comproba o URL do servidor nas preferencias e a túa conexión a internet." - -#. 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 "descoñecido" - -#: ../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 "" -"A subida ao servidor fallou porque o teu
paquete " -"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Violación de condición previa" +#: ../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 "Maquina descoñecida" -#: ../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 "" -"A subida fallou porque a primitiva que intentou " -"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "A primitiva xa foi borrada" @@ -3821,5 +3596,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}" @@ -4199,4 +3974,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 @@ -4268,8 +4045,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 @@ -4394,5 +4171,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 "borrado" @@ -4452,5 +4229,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 "" @@ -4492,4 +4269,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 @@ -4503,5 +4281,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 "" @@ -4607,4 +4385,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 "Non hai conflitos sobre os que facer zoom" + +#: ../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 @@ -4617,24 +4431,23 @@ msgstr "" -#: ../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 "Escolle unha cor" - -#: ../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 -#, fuzzy, java-format +#: ../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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4642,12 +4455,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "o parámetro \"{0}\" debe non ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4655,14 +4468,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 "Ainda sen implementar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4675,7 +4489,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Borrar da relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4703,24 +4516,8 @@ msgstr[1] "{0} relacións" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Relación contradictoria" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Resolver Conflitos" - -#: ../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 "Pegar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4735,9 +4532,73 @@ #: ../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} vía" -msgstr[1] "{0} vías" +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 "Eliminar o membro da fila actual desta relación" + +#: ../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 "Nome real" + +#: ../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 "Tecla:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Valor" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisión" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4764,5 +4625,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}" @@ -4795,5 +4656,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." @@ -4866,13 +4727,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 "Capa: {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 "Relacións: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4959,5 +4820,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 "" @@ -5017,5 +4878,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 "Engadir" @@ -5065,5 +4926,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 "Relacións" @@ -5159,9 +5020,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 @@ -5174,7 +5035,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Máis información acerca desta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5255,5 +5115,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}" @@ -5271,9 +5131,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 "" @@ -5524,11 +5379,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 "" @@ -5542,7 +5397,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Cargando extensións anteriores" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5670,5 +5524,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Lugares" @@ -5746,9 +5600,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " +"mantendo o botón dereito pulsado. Seleccionar: Facer click." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5797,7 +5654,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Subir as preferencias actuais ó servidor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5830,7 +5686,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 @@ -6680,52 +6536,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 "Nome" @@ -6735,21 +6591,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 "Cambiar relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Máis información acerca desta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Último cambio en {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6767,7 +6621,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6808,12 +6661,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Por favor selecciona un valor" +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 "o parámetro \"{0}\" debe non ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6857,5 +6709,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6873,5 +6725,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 "" @@ -6890,5 +6742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6902,7 +6754,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Descartar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6915,7 +6766,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Gardar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7001,17 +6851,145 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Proporciona un breve comentario para os cambios que vas a subir:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Obxectos para engadir:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Obxectos para modificar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Obxectos para borrar:" + +#: ../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 "Subir Cambios" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Ficheiro" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Subir estes cambios?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Actualizando" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Por favor, introduce un nome para o lugar." + +#: ../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 "Non hai primitivas seleccionadas para actualizar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7244,5 +7222,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." @@ -7300,7 +7277,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Descargando datos" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7363,4 +7339,13 @@ msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" + +#: ../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 "" +"A subida de datos GPS sen procesar como datos de mapa considerase " +"perxudicial.
Se desexas subir trazados, mira aqui:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7549,5 +7534,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 "Por favor seleccione a fila a borrar." @@ -8034,7 +8019,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Amosar a ID do obxecto nas listas de selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8049,7 +8033,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Amosar a ID do obxecto nas listas de selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8427,8 +8410,4 @@ msgstr "Desactivar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Tecla:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8485,5 +8464,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 @@ -8494,42 +8473,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Engadir nodo na vía" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Borrar a capa seleccionada." - -#: ../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 "Máis información acerca desta característica" #. 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 "Atributos Opcionais:" -#: ../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 "Usar ó axuste preestablecido \"{0}\" do grupo \"{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 "Usar axuste preestablecido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "vía pechada" -#: ../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 "Tipo descoñecido: {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 @@ -8540,15 +8517,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {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 "Erro analizando {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 "Os elementos do tipo {0} están soportados." -#: ../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 @@ -8558,18 +8535,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../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 "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -8596,5 +8573,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 "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." @@ -8610,7 +8586,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 @@ -8688,5 +8661,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}" @@ -8694,5 +8667,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" @@ -8700,5 +8673,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" @@ -8719,6 +8691,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 @@ -8728,40 +8700,40 @@ msgstr "Descargando datos de OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Non se engadiu nada á selección buscando por \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8825,10 +8797,10 @@ msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../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 "" @@ -8836,11 +8808,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 "Pechando colección de cambios..." - -#: ../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}" @@ -8848,34 +8818,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 -#, java-format -msgid "Reusing existing changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Pechando colección de cambios..." - -#: ../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 "Pechando colección de cambios..." - -#: ../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 " @@ -8883,44 +8837,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../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 "Pechando colección de cambios..." - -#: ../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 "Pechando colección de cambios..." - -#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Subindo..." -#: ../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}." @@ -8939,10 +8893,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 "" @@ -9002,6 +8956,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 "Ficheiros de Servidor OSM" @@ -9030,5 +8989,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 "" @@ -9085,74 +9044,139 @@ msgstr "Erro durante a análise." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Versión descoñecida" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Falta o número de versión dos datos do OSM" - -#: ../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 "Falta o atributo obrigatorio \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Versión descoñecida: {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 "Atopouse un elemento no que non é unha vía." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " ten referencia cero" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Atopouse un elemento no que non é unha relación." - -#: ../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 "Especificación incompleta de elemento con 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 "Obxecto ilegal con 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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Versión descoñecida: {0}" + +#: ../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 "Falta o atributo obrigatorio \"{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 "" @@ -9161,16 +9185,31 @@ 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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "" +"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Preparar os datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "ID de nodo mal formada" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Preparar os datos de OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Preparando datos..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9217,33 +9256,43 @@ "internet." -#: ../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} restantes. Subindo {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} restantes. Subindo {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} restantes. Subindo {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 "Subindo..." + +#: ../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 "Nada que subir. Consigue algún dato antes." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9281,11 +9330,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 "" @@ -9296,4 +9340,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." msgstr "" @@ -9338,20 +9387,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 "Desactivar engadido" #: ../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 "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../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 " @@ -9361,5 +9410,9 @@ "permisos para sobrescribir os existentes." -#: ../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 "" @@ -9368,10 +9421,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../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 "Dacordo coa información contida no engadido, o autor é {0}." -#: ../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." @@ -9380,9 +9433,9 @@ "dun fallo." -#: ../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 "Debería ser desactivado o engadido?" -#: ../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 " @@ -9390,13 +9443,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" @@ -9452,4 +9505,35 @@ "\n" "{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 "descoñecido" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9523,4 +9607,94 @@ msgstr "(O texto xa foi copiado ao teu portapapeis.)" +#: ../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 "" +"A subida ao servidor fallou porque o teu
paquete " +"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" + +#: ../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 "" +"A subida fallou porque a primitiva que intentou " +"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9584,5 +9758,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9591,5 +9765,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9598,5 +9772,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9605,5 +9779,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9612,5 +9786,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9669,40 +9843,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}" @@ -9710,47 +9883,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 "Conectando..." -#: ../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 "Subida de datos cancelada" -#: ../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 "Error durante a subida de datos" -#: ../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 "A subida do GPX tivo éxito" -#: ../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 "Subindo trazado GPX: {0}% ({1} de {2})" -#: ../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 "" @@ -9963,5 +10136,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 "" @@ -9975,13 +10148,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 "" @@ -9990,9 +10163,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 "" @@ -10001,65 +10174,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 " @@ -10067,13 +10240,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 "Valores Predeterminados" @@ -10111,5 +10284,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 "Erro cargando ficheiro" @@ -10156,13 +10329,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" @@ -10171,13 +10344,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 "" @@ -10289,9 +10462,9 @@ "tamaño" -#: ../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 "" @@ -10444,7 +10617,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Seleccionar" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10528,5 +10700,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 "" @@ -11450,18 +11622,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 "Abrir só ficheiros que sexan visibles na vista actual." -#: ../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}" @@ -11472,5 +11644,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 " @@ -11478,9 +11650,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 "" @@ -11491,28 +11663,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Crear novo nodo." + +#: ../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 " @@ -11521,28 +11698,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 "" @@ -12033,25 +12216,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Introducir valores para todos os conflitos." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Resolver Conflitos" + #: ../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 "" @@ -12123,6 +12314,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 "" @@ -12132,10 +12323,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 "" @@ -12222,51 +12413,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 "Desfacendo borrado de vía..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12305,18 +12510,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 "" @@ -12324,7 +12529,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 "Duplicar" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12335,7 +12539,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Borrar nodos ou vías." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12903,5 +13106,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12985,5 +13188,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 " @@ -12991,5 +13194,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 "" @@ -13007,17 +13210,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 "" @@ -13061,15 +13264,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -13080,108 +13283,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 "Gardar capa WMS nun ficheiro" -#: ../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 "Cargar capa WMS dende ficheiro" -#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../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 "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" -#: ../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 "Nome de Menú (Predeterminado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "URL WMS (Predeterminada)" -#: ../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 "Copiar Predeterminado" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy -msgid "Please select at least one row to copy." -msgstr "Por favor, selecciona polo menos unha vía." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" +msgid "Overlap tiles" +msgstr "Ficheiros de Servidor OSM" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" msgstr "" @@ -13547,5 +13761,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 "" @@ -14107,8 +14321,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 "Correo Electrónico" +msgstr "" #. color heath @@ -14126,5 +14339,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 "" @@ -14172,7 +14386,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "selección" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14183,7 +14396,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incompleto" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14387,4 +14599,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" @@ -14413,12 +14626,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 @@ -14466,5 +14679,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14501,5 +14714,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14563,6 +14776,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 "" @@ -14708,6 +14922,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 "" @@ -15287,7 +15501,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 "" @@ -15500,6 +15714,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 "" @@ -16411,7 +16625,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" @@ -16459,23 +16670,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 "" @@ -16499,5 +16710,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" @@ -16544,22 +16754,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 "" @@ -16574,22 +16784,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 "" @@ -16604,22 +16814,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 "" @@ -16653,5 +16863,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 "" @@ -16898,5 +17108,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17281,7 +17491,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "ata" +msgstr "" #. color tertiary @@ -17328,13 +17537,11 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Área de Descarga" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Pegar" +msgstr "" #: build/trans_presets.java:1721 @@ -17343,7 +17550,6 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "relación" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17405,7 +17611,6 @@ #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "nodo" +msgstr "" #: build/trans_presets.java:1737 @@ -17432,19 +17637,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Información" +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 "descripción de trazado gps" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "" #. @@ -17778,5 +17980,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17810,5 +18012,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18934,6 +19136,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 "" @@ -18942,66 +19144,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19010,76 +19212,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19411,5 +19613,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 "" @@ -19434,5 +19636,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 "" @@ -19440,5 +19642,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 "" @@ -19446,5 +19648,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 "" @@ -19452,5 +19654,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 "" @@ -19458,5 +19660,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 "" @@ -19515,10 +19717,141 @@ msgstr "" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Atrais" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Vía acuática" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "Ningún" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Básico" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Cor" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Atrais" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "abaixo" + +#. 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 "" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valor" + +#: build/trans_presets.java:2435 +msgid "white" +msgstr "" + +#: 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 "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19527,30 +19860,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 "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "" @@ -19559,10 +19892,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "" @@ -19571,10 +19904,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19582,33 +19915,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 "" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2475 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2476 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19616,9 +19949,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "" @@ -19626,27 +19959,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2496 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2501 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2504 +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "" @@ -19654,5 +19987,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "" @@ -19660,88 +19993,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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "" @@ -19749,9 +20082,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "" @@ -19759,9 +20092,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "" @@ -19769,18 +20102,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19788,54 +20121,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19843,9 +20176,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19853,9 +20186,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19863,54 +20196,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 "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "" @@ -19918,9 +20251,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "" @@ -19928,9 +20261,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19938,32 +20271,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "" @@ -19971,14 +20304,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "" -#: 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 "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "" @@ -19986,5 +20319,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "" @@ -19992,15 +20325,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "" @@ -20008,18 +20341,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "" @@ -20027,5 +20360,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "" @@ -20033,9 +20366,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "" @@ -20043,10 +20376,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20055,5 +20388,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20062,20 +20395,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "" #. 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 "" @@ -20083,5 +20416,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 "" @@ -20090,55 +20423,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -20146,15 +20479,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "" @@ -20162,10 +20495,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "" @@ -20173,25 +20506,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -20199,5 +20532,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20205,10 +20538,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "" @@ -20216,17 +20549,16 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "esquerda" +msgstr "" #. item #. -#: build/trans_presets.java:2825 +#: build/trans_presets.java:2828 msgid "Edit Islet" msgstr "" @@ -20234,5 +20566,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "" @@ -20240,10 +20572,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "" @@ -20251,10 +20583,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "" @@ -20262,10 +20594,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "" @@ -20273,70 +20605,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "" @@ -20345,15 +20677,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "" @@ -20362,5 +20694,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "" @@ -20368,17 +20700,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 "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "" @@ -20387,14 +20719,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20402,25 +20734,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20428,10 +20760,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20439,5 +20771,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20445,5 +20777,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20452,45 +20784,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20498,25 +20830,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20524,10 +20856,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20535,20 +20867,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20556,5 +20888,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20562,15 +20894,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "" @@ -20578,9 +20910,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "" @@ -20588,39 +20920,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20628,15 +20960,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20644,55 +20976,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20702,5 +21034,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 "" @@ -20709,10 +21041,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20720,5 +21052,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20727,5 +21059,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20733,34 +21065,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20769,15 +21101,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20785,5 +21117,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20792,5 +21124,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20798,5 +21130,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20804,5 +21136,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20868,5 +21200,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 @@ -20875,17 +21207,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20938,5 +21270,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 @@ -20945,13 +21277,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20965,10 +21297,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20976,31 +21308,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -21009,30 +21341,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24185,76 +24517,4 @@ msgstr "" -#. 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 "" - #. color green #. @@ -25222,44 +25482,38 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. " -#~ "Por favor, informa disto como un erro." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Borrar {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Non se pode abrir o directorio de preferencias: {0}" - -#~ msgid "nodes" -#~ msgstr "nodos" - -#~ msgid "ways" -#~ msgstr "vías" - -#~ msgid "relations" -#~ msgstr "relacións" - -#~ msgid "Delete Layer" -#~ msgstr "Borrar Capa" - -#~ msgid "Authors: {0}" -#~ msgstr "Autores: {0}" - -#~ msgid "Public" -#~ msgstr "Público" +#. 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 "Todas as vías están vacías" + +#~ msgid "Merge Anyway" +#~ msgstr "Acoplar de todas formas" + +#~ msgid "Unknown version" +#~ msgstr "Versión descoñecida" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Falta o número de versión dos datos do OSM" + +#~ msgid "Found element in non-way." +#~ msgstr "Atopouse un elemento no que non é unha vía." + +#~ msgid " has zero ref" +#~ msgstr " ten referencia cero" + +#~ msgid "Found element in non-relation." +#~ msgstr "Atopouse un elemento no que non é unha relación." + +#~ msgid "Ill-formed node id" +#~ msgstr "ID de nodo mal formada" #~ msgid "" @@ -25276,18 +25530,8 @@ #~ msgstr "Abortando..." -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " -#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click." - #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" #~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar" -#~ msgid "Basic" -#~ msgstr "Básico" - #~ msgid "Occupied By" #~ msgstr "Ocupado por" @@ -25307,7 +25551,4 @@ #~ msgid "Move Down" #~ msgstr "Mover cara abaixo" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Eliminar o membro da fila actual desta relación" #~ msgid "Relation Editor: {0}" @@ -25338,4 +25579,10 @@ #~ "Revertir o estado de todos os obxectos seleccionados actualmenete á " #~ "versión seleccionada na lista do historial." + +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + +#~ msgid "Delete Layer" +#~ msgstr "Borrar Capa" #~ msgid "Login name (email) to the OSM account." @@ -25438,4 +25685,7 @@ #~ msgstr "Importar Ficheiro TCX..." +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor." + #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Algúns dos nodos están (case) na liña" @@ -25451,4 +25701,11 @@ #~ msgstr "sen nome" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar." + #~ msgid "" #~ "No data to update found. Have you already opened or downloaded a data " @@ -25471,10 +25728,23 @@ #~ msgstr "Capa de datos" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. " +#~ "Por favor, informa disto como un erro." + #~ msgid "Change" #~ msgstr "Cambiar" +#~ msgid "Delete {1} {0}" +#~ msgstr "Borrar {1} {0}" + #~ msgid "Move" #~ msgstr "Mover" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Non se pode abrir o directorio de preferencias: {0}" + #~ msgid "position" #~ msgstr "posición" @@ -25498,9 +25768,9 @@ #~ msgstr "A subida de datos fallou por causa descoñecida" +#~ msgid "Public" +#~ msgstr "Público" + #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Comprobando se o nodo {0} falta ..." - -#~ msgid "Undeleting Way..." -#~ msgstr "Desfacendo borrado de vía..." #~ msgid "Undeleting relation..." @@ -25549,4 +25819,13 @@ #~ msgstr "Actualización fallida" +#~ msgid "nodes" +#~ msgstr "nodos" + +#~ msgid "relations" +#~ msgstr "relacións" + +#~ msgid "ways" +#~ msgstr "vías" + #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Solucionar {0} conflitos en {1} obxectos" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 17594) +++ /applications/editors/josm/i18n/po/he.po (revision 17595) @@ -8,7 +8,7 @@ "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-04 10:56+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-07 18:36+0000\n" +"Last-Translator: ilangut \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\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:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+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 "עזרה" -#: ../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 "לא ניתן להפעיל היטל {0}. משתמש במרקטור" -#: ../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 "שגיאה" -#: ../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] "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?" -msgstr[1] "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "שינויים לא שמורים" -#: ../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 "שמור וצא" -#: ../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 "התעלם משינויים וצא" -#: ../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 "ביטול" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{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,15 +244,17 @@ msgstr "אזהרה" -#: ../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 "מתעלם מ-URL לא תקין לקובץ: \"{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}" -msgstr "" +msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -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 "תוספים" @@ -357,4 +359,6 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" +"אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה מחדש לדפי המידע או " +"ההיסטוריה תיכשל. URL בסיס של ה-API הוא: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 @@ -364,8 +368,10 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" +"אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה מחדש לדפי המשתמש " +"תיכשל. URL בסיס של ה-API הוא: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "" +msgstr "אנא בחר לפחות צומת, דרך, או הקשר אשר כבר הועלו למאגר" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 @@ -378,9 +384,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." -msgstr "" +msgstr "אנא בחר בשכת היעד" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 msgid "Select target layer" -msgstr "" +msgstr "בחר שכבת יעד" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 @@ -388,5 +394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469 msgid "Merge" -msgstr "" +msgstr "מזג" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 @@ -399,5 +405,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" -msgstr "" +msgstr "אין שכבות יעד" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -468,9 +474,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 +510,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 +528,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 "מידע" @@ -548,5 +554,5 @@ msgstr "נא בחר לפחות שלושה צמתים." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -555,10 +561,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -567,5 +573,5 @@ msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -576,9 +582,9 @@ "הערך הוא {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -633,26 +639,22 @@ msgstr "אין התנגשויות להתמקד בהם" -#: ../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 "שלב דרכים" -#: ../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 "שלב מספר דרכים לאחת." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "נא בחר לפחות שתי דרכים לשילוב." - -#: ../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 "לשלב שתי דרכים בעלות חברויות שונות?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "אחד בכל זאת" -#: ../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 " @@ -660,13 +662,13 @@ msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "לשנות כיוונים?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "הפוך כיוון ואחד" -#: ../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 " @@ -674,30 +676,18 @@ msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?" -#: ../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 "הזן ערכים לכל ההתנגשויות." - -#: ../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 "פתור התנגשויות" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "שלב {0} דרכים" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "כל הדרכים היו ריקות" - -#: ../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 "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "שלב {0} דרכים" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "נא בחר לפחות שתי דרכים לשילוב." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -726,5 +716,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "הצמתים הללו אינם חלק ממעגל. מבטל." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -733,4 +723,5 @@ "three nodes." msgstr "" +"יש לבחור בדיוק שתים או שלוש צמתים או דרך אחת עם בדיוק שתים או שלוש צמתים" #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 @@ -751,5 +742,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 "מחק" @@ -759,15 +750,15 @@ msgstr "מחק את הפריטים הנבחרים." -#: ../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 "שכתוב" -#: ../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 "הקובץ כבר קיים. לשכתב?" @@ -778,9 +769,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132 msgid "Distribute Nodes" -msgstr "" +msgstr "פזר צמתים" #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" +msgstr "פזר את הצמתים הנבחרים במרחקים שווים לאורך קו" #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 @@ -796,10 +787,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}" @@ -830,5 +821,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 @@ -838,5 +829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" +msgstr "התנגשות במהלך ההורדה" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 @@ -871,7 +862,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "כל התמונות" +msgstr "כל הפורמטים" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -895,5 +885,5 @@ #, java-format msgid "paramenter ''{0}'' must not be null" -msgstr "" +msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -905,5 +895,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "יצא קובץ GPX" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 @@ -970,10 +960,10 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "הצג היסטורית מידע אודות דרכי, דמתי ויחוסי OSM" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "מידע אודות אלמנט" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -1004,1028 +994,27 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 msgid "Merge Nodes" msgstr "מיזוג צמתים" -#: ../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 "מזג את הצמתים לישנים ביותר." -#: ../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 "אנא בחר לפחות שני צמתים למיזוג." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "למזג צמתים בעלי חברויות שונות?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "מזג בכל זאת" - -#: ../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 "" -"לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "מזג {0} צמתים" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "שיקוף" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "שקף את הנקודות והדרכים הבחורות" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "נא לבחור לפחות נקודה אחת או דרך" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "למעלה" - -#: ../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 "הזז פריטים {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "למטה" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "שמאלה" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "ימינה" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "הזז {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "הזז את הפריטים {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 "לא ניתן להזיז פריטים אל מחוץ לעולם." - -#: ../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 "חדש" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "צור מפה חדשה." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "פתח..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "פתח קובץ." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "פתח קובץ." - -#: ../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 "פתח מיקום..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "פתח URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "שכבה נפרדת" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "הזן כתובת להורדה:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "מיקום ההורדה" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "כתובת הורדה" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "ישר זוויות צורה" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "מותרות רק שתי נקודות" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "בחירה חייבת לכלול רק דרכים." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" - -#: ../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 "נבחרה רק נקודה אחת" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "יישר" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "הדבק" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "הדבק את תכני חוצץ ההדבקה." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "הדבק תגיות" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "טוען {0}" -msgstr[1] "טוען {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, 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 "מאפיינים..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "פתח את עמוד ההעדפות להגדרות כלליות." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "העדפות" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "בצע שוב" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "בצע שוב את הפעולה האחרונה שבוטלה." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "שנה את שם השכבה" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "שנה גם את שם הקובץ" - -#: ../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 "הפוך דרכים" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "אנא בחר לפחות דרך אחת." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "הפוך דרכים" - -#: ../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 "שמירה" - -#: ../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 "שמור את הנתונים הנוכחיים." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "הקובץ {0} כבר קיים. לדרוס אותו?" - -#: ../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 "מסמך ריק" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "המסמך לא מכיל נתונים" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "שמור בכל זאת" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "התנגשויות" - -#: ../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 "" -"ישנן התנגשויות בלתי פתורות. ההתנגשויות לא ישמרו ויטופלו כאילו דחית הכל. " -"להמשיך?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "דחה התנגשויות ושמור" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "שמור קובץ OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "שמור קובץ GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "שמור שכבה" - -#: ../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 "שמור בשם..." - -#: ../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 "שמור את המידע הנוכחי לקובץ חדש." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "בחר הכל" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "הצג דו\"ח מצב" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "עזרה: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "דו\"ח מצב" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "" - -#: ../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 "סגור" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "פצל דרך" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "פצל דרך בנקודה הבחורה." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול." - -#: ../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] "הנקודה הנבחרת לא נמצאת בתוך אף דרך." -msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך." - -#: ../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] "יותר מדרך אחת משתמשת בנקודה שבחרת. בחר גם את הדרך." -msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "הנקודות הבחורות אינן שייכות לאותה דרך." - -#: ../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] "הדרך הבחורה אינה מכילה את הנקודה הבחורה." -msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות." - -#: ../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 "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית." - -#: ../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 "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" - -#: ../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 "פצל דרך {0} ל-{1} חלקים" - -#: ../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 -#, fuzzy -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 -#, fuzzy -msgid "No open changeset" -msgstr "אל תחל את השינויים" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "צייר קווים בין נקודות ה-gps הגולמיות." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "הפרד דרכים" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "שכפל נקודות המשותפות למספר דרכים." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "הנקודה לא מוצמדת לשום דבר אחר." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "בחר:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" - -#: ../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 "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או" - -#: ../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 "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או" - -#: ../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 "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "הפרד נקודה" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "בטל" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "בטל את הפעולה האחרונה." - -#: ../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 "בטל את כל הבחירות" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "בטל את כל בחירות העצמים" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "עדכן נתונים" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" - -#. 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 "" - -#: ../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 "עדכן בחירה" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "בחירה ריקה" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "העלה ל-OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "העלה את כל השינויים לשרת ה-OSM" - -#: ../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 "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "אין מה להעלות. קבל כמה נתונים תחילה." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "אין שינויים להעלאה." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "סנכרן רק את {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 "סנכרן את כל סט הנתונים" - -#: ../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 "התגלתה התנגשות" - -#. 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 "ערך מוחזר לא צפוי. התקבל {0}" - -#: ../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 "העלאה ל-API של OSM נכשלה" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "העלה את השינויים האלה?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "העלה שינויים" - -#: ../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 "הוסף צומת חדש לדרך קיימת" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "הגדרות מפה" - -#: ../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 "פריטים להוספה:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "פריטים לשינוי:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "פריטים למחיקה:" - -#: ../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] "פריטים להוספה:" -msgstr[1] "פריטים להוספה:" - -#: ../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] "פריטים לשינוי:" -msgstr[1] "פריטים לשינוי:" - -#: ../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] "פריטים למחיקה:" -msgstr[1] "פריטים למחיקה:" - -#: ../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 "שינוי אחרון ב {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "התקרב" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "התרחק" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "חזרה" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "עבור אחורה." - -#: ../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 "שמע: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "מהר יותר" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "הרצה מהירה" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "העבר" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "קפוץ הלאה" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "הסימון הבא" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "נגן את הסמן הבא." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "נגן\\השהה" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "נגן/השהה את השמע." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "הסמן הקודם" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "נגן את הסמן הקודם." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "לאט יותר" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "הרצה איטית יותר" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "מוריד נתוני GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "הורדו נתוני GPX" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "נתוני GPS גולמיים" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "מוריד נתונים" - -#: ../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 "לא יובאו נתונים." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "נתוני OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "מוריד {0} מ-{1} (נותרו {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "שגיאות במהלך הורדה" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "מצב מחיקה" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "מחק צמתים או דרכים." - -#: ../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 "נקודה: {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 "" -"לחץ למחיקה. Shift: מחק מקטע דרך. Alt: אל תמחק צמתים שאינם בשימוש בעת מחיקת " -"דרך. Ctrl: מחק פריטים מפנים." - +#: ../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 @@ -2036,7 +1025,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 @@ -2045,6 +1035,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 @@ -2075,4 +1065,872 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "מזג {0} צמתים" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "שיקוף" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "שקף את הנקודות והדרכים הבחורות" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "נא לבחור לפחות נקודה אחת או דרך" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "למעלה" + +#: ../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 "הזז פריטים {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "למטה" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "שמאלה" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "ימינה" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "הזז {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "הזז את הפריטים {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 "לא ניתן להזיז פריטים אל מחוץ לעולם." + +#: ../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 "חדש" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "צור מפה חדשה." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "פתח..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "פתח קובץ." + +#: ../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 "פותח קובץ ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "פתח מיקום..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "פתח URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "שכבה נפרדת" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "הזן כתובת להורדה:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "מיקום ההורדה" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "כתובת הורדה" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "ישר זוויות צורה" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "מותרות רק שתי נקודות" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "בחירה חייבת לכלול רק דרכים." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" + +#: ../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 "נבחרה רק נקודה אחת" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "יישר" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "הדבק" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "הדבק את תכני חוצץ ההדבקה." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "הדבק תגיות" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "מדביק תג {0}" +msgstr[1] "מדביק תגים {0}" + +#: ../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 "מאפיינים..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "פתח את עמוד ההעדפות להגדרות כלליות." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "העדפות" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "בצע שוב" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "בצע שוב את הפעולה האחרונה שבוטלה." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "שנה את שם השכבה" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "שנה גם את שם הקובץ" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "לא ניתן לשנות את שם הקובץ ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "הפוך דרכים" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "אנא בחר לפחות דרך אחת." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "הפוך דרכים" + +#: ../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 "שמירה" + +#: ../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 "שמור את הנתונים הנוכחיים." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "הקובץ {0} כבר קיים. לדרוס אותו?" + +#: ../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 "מסמך ריק" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "שמור בכל זאת" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "המסמך לא מכיל נתונים" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "התנגשויות" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "דחה התנגשויות ושמור" + +#: ../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 "" +"ישנן התנגשויות בלתי פתורות. ההתנגשויות לא ישמרו ויטופלו כאילו דחית הכל. " +"להמשיך?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "שמור קובץ OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "שמור קובץ GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "שמור שכבה" + +#: ../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 "שמור בשם..." + +#: ../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 "שמור את המידע הנוכחי לקובץ חדש." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "בחר הכל" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "הצג דו\"ח מצב" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "עזרה: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "דו\"ח מצב" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "העתק ללוח הגזירים וסגור" + +#: ../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 "סגור" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "פצל דרך" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "פצל דרך בנקודה הבחורה." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול." + +#: ../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] "הנקודה הנבחרת לא נמצאת בתוך אף דרך." +msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך." + +#: ../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] "יותר מדרך אחת משתמשת בנקודה שבחרת. בחר גם את הדרך." +msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "הנקודות הבחורות אינן שייכות לאותה דרך." + +#: ../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] "הדרך הבחורה אינה מכילה את הנקודה הבחורה." +msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות." + +#: ../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 "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית." + +#: ../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 "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" + +#: ../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 "פצל דרך {0} ל-{1} חלקים" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "צייר קווים בין נקודות ה-gps הגולמיות." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "הפרד דרכים" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "שכפל נקודות המשותפות למספר דרכים." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "הנקודה לא מוצמדת לשום דבר אחר." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "בחר:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" + +#: ../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 "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או" + +#: ../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 "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או" + +#: ../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 "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "הפרד נקודה" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "בטל" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "בטל את הפעולה האחרונה." + +#: ../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 "בטל את כל הבחירות" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "בטל את כל בחירות העצמים" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "עדכן נתונים" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#. 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 "" + +#: ../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 "עדכן בחירה" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "בחירה ריקה" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "העלה ל-OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "העלה את כל השינויים לשרת ה-OSM" + +#: ../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 "אין מה להעלות. קבל כמה נתונים תחילה." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "אין שינויים להעלאה." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "סנכרן רק את {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 "סנכרן את כל סט הנתונים" + +#: ../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 "התגלתה התנגשות" + +#. 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 "ערך מוחזר לא צפוי. התקבל {0}" + +#: ../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 "העלאה ל-API של OSM נכשלה" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "התקרב" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "התרחק" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "חזרה" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "עבור אחורה." + +#: ../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 "שמע: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "מהר יותר" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "הרצה מהירה" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "העבר" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "קפוץ הלאה" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "הסימון הבא" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "נגן את הסמן הבא." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "נגן\\השהה" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "נגן/השהה את השמע." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "הסמן הקודם" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "נגן את הסמן הקודם." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "לאט יותר" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "הרצה איטית יותר" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "מוריד נתוני GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "הורדו נתוני GPX" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "נתוני GPS גולמיים" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "מוריד נתונים" + +#: ../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 "לא יובאו נתונים." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "נתוני OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "מוריד {0} מ-{1} (נותרו {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "שגיאות במהלך הורדה" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "מצב מחיקה" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "מחק צמתים או דרכים." + +#: ../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 "נקודה: {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 "" +"לחץ למחיקה. Shift: מחק מקטע דרך. Alt: אל תמחק צמתים שאינם בשימוש בעת מחיקת " +"דרך. Ctrl: מחק פריטים מפנים." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2187,18 +2045,18 @@ "לסנכרון השמע בנקודה זו." -#: ../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 "בחר" -#: ../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" @@ -2207,17 +2065,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 "" @@ -2227,5 +2085,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 "" @@ -2343,7 +2201,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "nodes:...-עצמים עם מספר הנקודות הנתון" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2394,41 +2251,41 @@ msgstr "חפש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "התחל חיפוש" -#: ../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 "לא נמצאה התאמה עבור \"{0}\"" -#: ../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 "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../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 "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../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 "נמצאו {0} התאמות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2441,40 +2298,40 @@ "{2}" -#: ../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 "" -#: ../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 "חסרים ארגומנטים ל-or." -#: ../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 "חסרים ארגומנטים ל-not." -#: ../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 "" @@ -2483,5 +2340,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." @@ -2518,7 +2375,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "הוסף צומת" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2528,52 +2385,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "יחסים: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "שנה עצם {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "שינוי אחרון ב {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "שנה יחס" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "הסר \"{0}\" מ-{1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "הסר \"{0}\" מ-{1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "הסר \"{0}\" מ-{1} \"{2}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "קבע {0}={1} עבור {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "קבע {0}={1} עבור {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "קבע {0}={1} עבור {2} \"{3}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2643,30 +2500,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] "מחק {0}{1}" -msgstr[1] "מחק {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] "מצב מחיקה" -msgstr[1] "מצב מחיקה" +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] "מחק {0}{1}" -msgstr[1] "מחק {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] "מחק מיחס" -msgstr[1] "מחק מיחס" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2700,5 +2557,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." @@ -2778,17 +2635,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "פתור התנגשות התווית {0} ב-{1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "פתור התנגשות התווית {0} ב-{1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "פתור התנגשות התווית {0} ב-{1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2798,17 +2655,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "פתור התנגשות גירסאות ב-{0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "פתור התנגשות גירסאות ב-{0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "פתור התנגשות גירסאות ב-{0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2944,9 +2801,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3013,5 +2870,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 @@ -3019,23 +2876,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 "פרמטר ''{0}'' אינו יכול להיות אפס" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "שגיאה: {0}" -#: ../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 "אזהרה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "אינדקס טור לא צפוי. התקבל {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "ערך מוחזר לא צפוי. התקבל {0}" + +#: ../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 @@ -3048,11 +2930,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 "" @@ -3103,9 +2990,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." @@ -3114,118 +3001,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 "מחק איבר \"{0}\" ביחס." -#: ../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 "הדרך \"{0}\" בת פחות משתי נקודות." -#: ../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 "יותר מ-\"to\" אחד נמצא." -#: ../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 "יותר מ-\"via\" אחד נמצא." -#: ../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 "אף דרך \"from\" לא נמצאה." -#: ../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 "אף דרך \"to\" לא נמצאה." -#: ../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 "לא נמצאה אף נקודה או דרך מסוג \"via\"" -#: ../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 "דרך פנימית ''{0}'' נמצאת בחוץ." -#: ../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 "טקסט" @@ -3248,5 +3135,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" @@ -3257,5 +3144,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" @@ -3266,5 +3153,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" @@ -3373,5 +3260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "מסילת רכבת" @@ -3403,127 +3290,33 @@ msgstr[1] "{0} חברים" -#: ../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 "לא ידוע" - -#: ../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 "הפרת תנאי מקדים" +#: ../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 "מארח לא ידוע" -#: ../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 "" @@ -3740,5 +3533,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}" @@ -4123,4 +3916,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 @@ -4192,8 +3987,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 @@ -4316,5 +4111,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 "מחוק" @@ -4374,5 +4169,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 "" @@ -4414,4 +4209,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 @@ -4425,5 +4221,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 "" @@ -4529,4 +4325,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 "אין התנגשויות להתמקד בהם" + +#: ../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 @@ -4539,24 +4371,23 @@ msgstr "הכל" -#: ../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 "בחר צבע" - -#: ../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}''" @@ -4564,7 +4395,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 "הפרמטר '{0}' לא יכול ליהיות ריק (null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4577,15 +4408,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../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 +msgstr "" + +#: ../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 "עדיין לא הוטמע." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4594,12 +4425,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "תייג אדמה כ" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "מחק מיחס" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4627,24 +4456,8 @@ msgstr[1] "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "פתרון התנגשות" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "פתור התנגשויות" - -#: ../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 "הדבק" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4659,9 +4472,75 @@ #: ../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}" -msgstr[1] "{0} דרכים" +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 "הסר את החבר בשורת הטבלה הבחורה מהיחס" + +#: ../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 "מקום" + +#: ../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 +#, fuzzy +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 "ערך" + +#: ../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 "חד סטרי" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "מהדורה" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4688,5 +4567,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}" @@ -4717,5 +4596,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." @@ -4788,13 +4667,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 "מפה: {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 "יחסים: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4880,5 +4759,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 "<שונה>" @@ -4937,5 +4816,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 "הוסף" @@ -4985,5 +4864,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 "יחסים" @@ -5076,9 +4955,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] "מחבר" -msgstr[1] "מחבר" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5091,7 +4970,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "עוד מידע על הכלי הזה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5172,5 +5050,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}" @@ -5188,9 +5066,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 "" @@ -5441,11 +5314,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 "" @@ -5459,7 +5332,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "טען תוספים מוקדמים" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5583,5 +5455,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "מקומות" @@ -5662,5 +5534,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 "" @@ -5710,7 +5582,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "העלה את המאפיינים הנוכחיים לשרת" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6593,52 +6464,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 "שם" @@ -6648,21 +6519,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 "שנה יחס" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "עוד מידע על הכלי הזה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "שינוי אחרון ב {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6680,7 +6549,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "שם רחוב" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6721,7 +6589,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "נא בחר ערך" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6770,6 +6637,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" -msgstr "" +#, fuzzy +msgid "Unsaved data and conflicts" +msgstr "פתור התנגשויות" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6786,5 +6654,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 "" @@ -6803,5 +6671,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6815,7 +6683,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "התעלם משינויים וצא" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6828,7 +6695,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "שמור וצא" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6906,7 +6772,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "בטעינה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6915,12 +6780,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" + +#: ../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 "פריטים להוספה:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "פריטים לשינוי:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "פריטים למחיקה:" + +#: ../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 "העלה שינויים" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "קובץ" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "העלה את השינויים האלה?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "העלאה" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "נא הזן שם עבור המיקום." + +#: ../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 @@ -7157,5 +7151,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." @@ -7213,7 +7206,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "מוריד נתונים" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7276,4 +7268,13 @@ msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" + +#: ../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 "" +"העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.
אם אתה רוצה להעלות " +"מסלולים, ראה כאן:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7460,5 +7461,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 "נא בחר את השורה למחיקה." @@ -8273,8 +8274,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!" @@ -8331,5 +8328,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 @@ -8340,42 +8337,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "הוסף שכבה חדשה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "מחק את השכבה הנבחרת." - -#: ../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 "עוד מידע על הכלי הזה" #. 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 "מאפייני רשות:" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "סוג לא ידוע: {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 @@ -8386,15 +8381,15 @@ msgstr "" -#: ../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 "שגיאה בניתוח {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 "" -#: ../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 @@ -8404,18 +8399,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../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 "כלום לא נבחר!" -#: ../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 "שנה תכונות" @@ -8442,5 +8437,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, כנראה שחסרים תגים." @@ -8456,7 +8450,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 @@ -8532,5 +8523,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}" @@ -8538,5 +8529,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" @@ -8544,5 +8535,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" @@ -8563,6 +8553,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 @@ -8572,40 +8562,40 @@ msgstr "מוריד מידע של OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8667,10 +8657,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 "" @@ -8678,11 +8668,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 "מכין נתונים..." - -#: ../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}" @@ -8690,33 +8678,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 -#, java-format -msgid "Reusing existing changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#: ../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 "שינוי אחרון ב {0}" - -#: ../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 " @@ -8724,44 +8697,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "" -#: ../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 "צור קשר עם {0}..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Leaving changeset {0} open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +#: ../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 "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "מעלה..." -#: ../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}." @@ -8780,10 +8753,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 "" @@ -8841,6 +8814,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" @@ -8869,5 +8847,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 "" @@ -8924,74 +8902,139 @@ msgstr "שגיאה בזמן הניתוח." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "גרסה לא ידוע" - -#: ../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 +#, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "גירסת API: {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 "נמצא שלא בתוך דרך." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "ל אין התייחסות (ref)" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "" - -#: ../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 "" -#: ../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 "עצם לא חוקי עם 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 +#, java-format +msgid "Missing required attribute ''{0}''." msgstr "" #: ../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 "" @@ -9000,16 +9043,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 "מכין נתוני OSM..." -#: ../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 "מכין נתוני OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "מכין נתונים..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9054,33 +9111,43 @@ msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#: ../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 "מעלה..." + +#: ../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 "אין מה להעלות. קבל כמה נתונים תחילה." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9118,11 +9185,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 "" @@ -9135,4 +9197,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 @@ -9174,20 +9241,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 "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?" -#: ../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 " @@ -9197,5 +9264,9 @@ "הקיימים." -#: ../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 "" @@ -9203,19 +9274,19 @@ msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"." -#: ../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 "לפי המידע בתוסף, המחבר הוא {0}." -#: ../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 " @@ -9223,13 +9294,13 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../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" @@ -9286,4 +9357,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 "לא ידוע" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9355,4 +9457,88 @@ msgstr "(הטקסט כבר הועתק ל-clipboard שלך)." +#: ../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 @@ -9422,5 +9608,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9429,5 +9615,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9436,5 +9622,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9443,5 +9629,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9450,5 +9636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9507,40 +9693,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}" @@ -9548,47 +9733,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 "GPX הועלה בהצלחה" -#: ../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 "" @@ -9801,5 +9986,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 "" @@ -9813,13 +9998,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 "" @@ -9830,9 +10015,9 @@ "פורמט מצופה: {0}" -#: ../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 "" @@ -9843,65 +10028,65 @@ "פורמט מצופה: {0}" -#: ../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 " @@ -9909,13 +10094,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 "" @@ -9953,5 +10138,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 "שגיאה בטעינת קובץ" @@ -9998,13 +10183,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" @@ -10013,13 +10198,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 "" @@ -10129,9 +10314,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 "" @@ -10284,7 +10469,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "בחר" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10368,5 +10552,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 "שכבה ריקה" @@ -11291,18 +11475,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}" @@ -11313,5 +11497,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 " @@ -11320,9 +11504,9 @@ "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים." +#: ../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 "קובץ הרצת פיירפוקס" @@ -11333,28 +11517,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "יוצר נקודה חדשה." + +#: ../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 " @@ -11365,28 +11554,35 @@ "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף." -#: ../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 "שלט רחוק ביקש להוריד נתונים מה-API" -#: ../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 "בקש פרטים: {0}" -#: ../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 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "שלט רחוק ביקש להוריד נתונים מה-API" + +#: ../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 "שלט רחוק מבקש לייבא נתונים מה-URL הבא:" @@ -11877,25 +12073,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "הזן ערכים לכל ההתנגשויות." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "פתור התנגשויות" + #: ../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 "" @@ -11967,6 +12171,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 "שגיאת תקינות" @@ -11976,10 +12180,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 "" @@ -12068,51 +12272,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 "ביטול מחיקת דרך..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12144,7 +12362,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "דרכים חוצות" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12152,19 +12369,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 -#, fuzzy +#: ../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 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12172,19 +12388,16 @@ #: ../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 "שכפל דרך" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "ייצר דרך משוכפלת" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12751,5 +12964,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "אירעה שגיאה" @@ -12833,5 +13046,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 " @@ -12839,5 +13052,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 "" @@ -12855,17 +13068,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 "" @@ -12906,19 +13119,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "מיושן" - -#: ../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 "" @@ -12929,110 +13141,121 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "תאריך שגוי" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../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 "שמור שכבת WMS לקובץ" -#: ../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 "טען שכבת WMS מקובץ" -#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../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 "WMS" -#: ../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 "פתח שכבת WMS ריקה לטעינת נתונים מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "מאפייני תוסף WMS" -#: ../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 "כתובת WMS" -#: ../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 "כתובת WMS (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "הזן שם תפריט וכתובת WMS" -#: ../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 "העתק ברירת מחדל" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "שטחים חופפים" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "אנא בחר לפחות דרך אחת." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "צפון" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13399,5 +13622,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 "התייחסות" @@ -13939,7 +14162,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "בריאות" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -13960,8 +14182,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 "השכרה" +msgstr "" #. color heath @@ -13979,5 +14200,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 "" @@ -13990,7 +14212,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "כרטיסי חניה" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14026,7 +14247,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "אבני ריצוף" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14037,7 +14257,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "לא גמור" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14048,7 +14267,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "דשא" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14242,4 +14460,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" @@ -14268,12 +14487,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 @@ -14321,5 +14540,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14356,5 +14575,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14418,6 +14637,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 "לא" @@ -14563,6 +14783,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 "סוג" @@ -14833,7 +15053,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "הולכי רגל" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14852,7 +15071,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "דוקרנים" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15144,7 +15362,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 "מפעיל" @@ -15357,6 +15575,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 "הגבהה" @@ -16268,7 +16486,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" @@ -16316,23 +16531,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 "שעות פתיחה" @@ -16356,5 +16571,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" @@ -16401,22 +16615,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 "" @@ -16431,22 +16645,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 "" @@ -16461,22 +16675,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 "" @@ -16510,5 +16724,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 "" @@ -16528,7 +16742,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "סמן כהושלם" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16756,5 +16969,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "מקלט" @@ -17139,7 +17352,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "עצור" +msgstr "" #. color tertiary @@ -17186,23 +17398,19 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "הורדת איזור" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "הדבק" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "עיר" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "אזור" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17230,7 +17438,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "צעידה הררית" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17244,7 +17451,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "בניין" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17261,13 +17467,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "ביקורת גבולות" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "מתחילים" +msgstr "" #: build/trans_presets.java:1737 @@ -17284,7 +17488,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "שקנאי" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17295,19 +17498,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "מידע" +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 "תיאור מסלול GPS" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "שמע" +msgstr "" #. @@ -17318,7 +17518,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "מספר טלפון" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17642,5 +17841,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17674,5 +17873,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18798,6 +18997,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 "דת" @@ -18806,66 +19005,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 "בודהיסט" -#: 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 "נוצרי" -#: 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 "הינדי" -#: 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 "יהודי" -#: 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 "מוסלמי" -#: 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 "סיקי" -#: 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 "ספיריטואליסט" -#: 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 "טאואיסט" -#: 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 "" -#: 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 "" @@ -18874,76 +19073,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 "אנגליקני" -#: 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 "באפטיסט" -#: 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 "קתולי" -#: 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 "" -#: 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 "" -#: 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 "לותרני" -#: 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 "מתודיסט" -#: 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 "מורמוני" -#: 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 "אורתודוקסי" -#: 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 "" -#: 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 "" -#: 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 "פרוטסטנטי" -#: 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 "" -#: 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 "שיעי" -#: 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 "סוני" @@ -19275,5 +19474,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 "" @@ -19298,5 +19497,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 "" @@ -19304,5 +19503,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 "" @@ -19310,5 +19509,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 "" @@ -19316,5 +19515,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 "" @@ -19322,5 +19521,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 "" @@ -19379,10 +19578,143 @@ msgstr "ספסל" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "חזרה" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "מצבת זיכרון" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "כלום" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "מקום" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "צבע" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "חזרה" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "למטה" + +#. 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 "ירוק" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "סוף" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "ערך" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "מים" + +#: 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 "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19391,30 +19723,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 "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "מזרקה" @@ -19423,10 +19755,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "ערוך מזרקה" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "מי שתיה" @@ -19435,10 +19767,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "ערוך מי שתיה" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19446,34 +19778,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 "חנויות" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "סופרמרקט" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "ערוך סופרמרקט" -#: 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 "ערוך עיר" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "מכולת" @@ -19481,9 +19812,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "ערוך מכולת" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "קיוסק" @@ -19491,29 +19822,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "ערוך קיוסק" -#: 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 "ערוך נחל" - -#: 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 "ערוך עץ" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "מכונת ממכר" @@ -19521,5 +19850,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "ערוך מכונת ממכר" @@ -19527,88 +19856,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 "כרטיסים לתחבורה ציבורית" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "מפות תחבורה ציבורית" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "כרטיסי חניה" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "מזון" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "משקאות" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "ממתקים" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "סיגריות" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "תמונות" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "מזון בע\"ח" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "עיתונים" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "צעצועים" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "בולים" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "כרטיס SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "שוברי טלפון" -#: 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 "קונדומים" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "טמפונים" -#: 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 "קצבייה" @@ -19616,9 +19945,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "ערוך קצבייה" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "מאפייה" @@ -19626,9 +19955,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "ערוך מאפייה" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "פרחים" @@ -19636,18 +19965,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "ערוך חנות פרחים" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "ערוך חנות אורגנית" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19655,54 +19984,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "ערוך חנות מחשבים" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "ערוך חנות אלקטרוניקה" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "ערוך חנות רהיטים" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19710,9 +20039,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19720,9 +20049,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "חנות עשה-זאת-בעצמך" @@ -19730,54 +20059,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 "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "מספרה" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "ערוך מספרה" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "ערוך חנות נעליים" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "ערוך חנות צעצועים" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "ערוך חנות וידאו" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "ניקוי יבש" @@ -19785,9 +20114,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "ערוך ניקוי יבש" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "מכבסה" @@ -19795,9 +20124,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "ערוך מכבסה" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19805,32 +20134,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "ערוך חנות ספורט" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "ערוך אופטיקאי" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "מזומן" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "בנק" @@ -19838,14 +20167,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "ערוך בנק" -#: 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 "כספומט" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "החלפת כסף" @@ -19853,5 +20182,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "ערוך החלפת כסף" @@ -19859,15 +20188,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "ערוך כספומט" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "בריאות" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "רופאים" @@ -19875,18 +20204,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "ערוך רופאים" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "רופא שיניים" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "ערוך רופא שיניים" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "בית מרקחת" @@ -19894,5 +20223,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "ערוך בית מרקחת" @@ -19900,9 +20229,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "בית חולים" @@ -19910,10 +20239,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "ערוך בית חולים" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "נקודת גישה בחירום" @@ -19922,5 +20251,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "ערוך נקודת גישה בחירום" @@ -19929,20 +20258,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "מספר נקודה" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "מספר טלפון" #. 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 "(השתמש בקדומת בינלאומית, למשל +12-345-67890)" @@ -19950,5 +20279,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 "וטרינרי" @@ -19957,55 +20286,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "ערוך וטרינרי" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "יבשת" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "ערוך יבשת" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "ארץ" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "ערוך ארץ" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "מדינה" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "ערוך מדינה" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "אזור" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "ערוך אזור" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "מחוז" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "ערוך מחוז" @@ -20013,15 +20342,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "עיר" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "ערוך עיר" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "עיירה" @@ -20029,10 +20358,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "ערוך עיירה" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "פרבר" @@ -20040,25 +20369,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "ערוך פרבר" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "כפר" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "ערוך כפר" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "כפר קטן" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "ערוך כפר קטן" @@ -20066,5 +20395,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "מקומיות" @@ -20072,10 +20401,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "ערוך מקומיות" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "אי" @@ -20083,24 +20412,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "ערוך אי" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "שמאלה" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "ערוך טירה" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "פתח מערה" @@ -20108,10 +20435,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "ערוך פתח מערה" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "פסגה" @@ -20119,10 +20446,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "ערוך פסגה" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "קרחון" @@ -20130,10 +20457,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "ערוך קרחון" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "הר געש" @@ -20141,70 +20468,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "ערוך הר געש" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "גבולות" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "לאומי" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "ערוך גבול לאומי" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "מנהלי" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "ערוך גבול מנהלי" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "אזרחי" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "ערוך תחום אזרחי" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "פוליטי" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "ערוך תחום פוליטי" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "גן לאומי" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "ערוך תחום גן לאומי" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "עץ" @@ -20213,15 +20540,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "ערוך עץ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "שם בוטני" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "חורש" @@ -20230,5 +20557,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "ערוך חורש" @@ -20236,17 +20563,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 "מחטני" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "נשיר" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "מעורב" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "יער" @@ -20255,14 +20582,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20270,25 +20597,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20296,10 +20623,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "שדה-בור" @@ -20307,5 +20634,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "ערוך שדה-בור" @@ -20313,5 +20640,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "חצר משק" @@ -20320,45 +20647,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "אדמה חקלאית" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "כרם" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20366,25 +20693,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "דשא" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20392,10 +20719,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20403,20 +20730,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20424,5 +20751,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20430,15 +20757,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "אזור מגורים" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "בית-קברות" @@ -20446,9 +20773,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "ערוך בית-קברות" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "בית עלמין" @@ -20456,39 +20783,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "קמעוני" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "מסחרי" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "תעשייתי" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20496,15 +20823,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "צבאי" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20512,55 +20839,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "אתר בניה" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "מחצבה" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20570,5 +20897,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 "" @@ -20577,10 +20904,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20588,5 +20915,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20595,5 +20922,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20601,34 +20928,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20637,15 +20964,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20653,5 +20980,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20660,5 +20987,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20666,5 +20993,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20672,5 +20999,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20736,5 +21063,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 @@ -20743,17 +21070,17 @@ msgstr "אופניים" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "אוטובוס" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20806,5 +21133,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 @@ -20813,13 +21140,13 @@ msgstr "רגל" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20833,10 +21160,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "רכבת תחתית" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20844,31 +21171,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20877,30 +21204,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24053,76 +24380,4 @@ msgstr "היסטורי" -#. 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 "ירוק" - #. color green #. @@ -25090,9 +25345,82 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ 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 "כל הדרכים היו ריקות" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "למזג צמתים בעלי חברויות שונות?" + +#~ msgid "Merge Anyway" +#~ msgstr "מזג בכל זאת" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?" + +#~ msgid "Unknown version" +#~ msgstr "גרסה לא ידוע" + +#~ msgid "Found element in non-way." +#~ msgstr "נמצא שלא בתוך דרך." + +#~ msgid " has zero ref" +#~ msgstr "ל אין התייחסות (ref)" + +#~ msgid "Move" +#~ msgstr "הזז" + +#~ msgid "Data Layer" +#~ msgstr "שכבת נתונים" + +#~ msgid "No document open so nothing to save." +#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." + +#~ msgid "Unknown file extension." +#~ msgstr "סיומת הקובץ אינה ידועה." + +#~ msgid "Email" +#~ msgstr "דוא\"ל" + +#~ msgid "Resolve Conflicts" +#~ msgstr "פתור התנגשויות" + +#~ msgid "There were conflicts during import." +#~ msgstr "ארעו התנגשויות במהלך הייבוא." + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" + +#~ msgid "their version:" +#~ msgstr "הגירסה שלהם:" + +#~ msgid "resolved version:" +#~ msgstr "הגירסה הפתורה:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:" +#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:" + +#~ msgid "my version:" +#~ msgstr "הגירסה שלי:" + +#~ msgid "Object" +#~ msgstr "פריט" + +#~ msgid "unnamed" +#~ msgstr "ללא שם" #~ msgid "" @@ -25103,87 +25431,4 @@ #~ "תקלה." -#~ msgid "No document open so nothing to save." -#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." - -#~ msgid "Delete {1} {0}" -#~ msgstr "מחק {1}{0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" - -#~ msgid "nodes" -#~ msgstr "נקודות" - -#~ msgid "ways" -#~ msgstr "דרכים" - -#~ msgid "relations" -#~ msgstr "יחסים" - -#~ msgid "Delete Layer" -#~ msgstr "מחק שכבה" - -#~ msgid "Authors: {0}" -#~ msgstr "מחברים: {0}" - -#~ msgid "Public" -#~ msgstr "ציבורי" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה." - -#~ msgid "Continue anyway" -#~ msgstr "המשך בכל זאת" - -#~ msgid "map" -#~ msgstr "מפה" - -#~ msgid "citymap" -#~ msgstr "מפת עיר" - -#~ msgid "hikingmap" -#~ msgstr "מפת צעידה" - -#~ msgid "bicyclemap" -#~ msgstr "מפת רכיבה" - -#~ msgid "Move" -#~ msgstr "הזז" - -#~ msgid "Data Layer" -#~ msgstr "שכבת נתונים" - -#~ msgid "Unknown file extension." -#~ msgstr "סיומת הקובץ אינה ידועה." - -#~ msgid "Email" -#~ msgstr "דוא\"ל" - -#~ msgid "Resolve Conflicts" -#~ msgstr "פתור התנגשויות" - -#~ msgid "There were conflicts during import." -#~ msgstr "ארעו התנגשויות במהלך הייבוא." - -#~ msgid "their version:" -#~ msgstr "הגירסה שלהם:" - -#~ msgid "resolved version:" -#~ msgstr "הגירסה הפתורה:" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:" -#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:" - -#~ msgid "my version:" -#~ msgstr "הגירסה שלי:" - -#~ msgid "Object" -#~ msgstr "פריט" - -#~ msgid "unnamed" -#~ msgstr "ללא שם" - #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -25227,4 +25472,7 @@ #~ msgstr "תאריך" +#~ msgid "Authors: {0}" +#~ msgstr "מחברים: {0}" + #~ msgid "OSM username (email)" #~ msgstr "שם משתמש OSM (אי-מייל)" @@ -25244,4 +25492,7 @@ #~ msgid "Change" #~ msgstr "שנה" + +#~ msgid "Delete {1} {0}" +#~ msgstr "מחק {1}{0}" #~ msgid "position" @@ -25297,6 +25548,6 @@ #~ msgstr "בדוק תקינות" -#~ msgid "end" -#~ msgstr "סוף" +#~ msgid "Public" +#~ msgstr "ציבורי" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -25328,7 +25579,4 @@ #~ msgstr "בסיסי" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס" - #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה." @@ -25336,4 +25584,7 @@ #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" + +#~ msgid "Delete Layer" +#~ msgstr "מחק שכבה" #~ msgid "" @@ -25351,9 +25602,27 @@ #~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?" +#~ msgid "Continue anyway" +#~ msgstr "המשך בכל זאת" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה." + +#~ msgid "citymap" +#~ msgstr "מפת עיר" + +#~ msgid "hikingmap" +#~ msgstr "מפת צעידה" + +#~ msgid "map" +#~ msgstr "מפה" + +#~ msgid "bicyclemap" +#~ msgstr "מפת רכיבה" + #~ msgid "sports" #~ msgstr "ספורט" -#~ msgid "Undeleting Way..." -#~ msgstr "ביטול מחיקת דרך..." +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור" #~ msgid "Checking whether node {0} is gone ..." @@ -25374,4 +25643,13 @@ #~ msgid "Selection too big" #~ msgstr "בחירה גדולה מידי" + +#~ msgid "nodes" +#~ msgstr "נקודות" + +#~ msgid "relations" +#~ msgstr "יחסים" + +#~ msgid "ways" +#~ msgstr "דרכים" #~ msgid "" @@ -25395,2 +25673,5 @@ #~ msgid "Relation Editor: {0}" #~ msgstr "עורך יחסים: {0}" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת." Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 17594) +++ /applications/editors/josm/i18n/po/is.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-09-05 14:32+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 19:36+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \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:37+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 "Hjálp" -#: ../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 "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin" -#: ../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 "Villa" -#: ../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] "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" -msgstr[1] "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Óvistaðar breytingar" -#: ../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 "Vista og hætta" -#: ../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 "Hunsa og hætta" -#: ../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 "Hætta við" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../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 "Aðvörun" -#: ../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 "" -#: ../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 "Viðbætur" @@ -368,4 +370,5 @@ msgid "Please select at least one already uploaded node, way, or relation." msgstr "" +"Þú verður að velja hnút, veg eða vensl sem hefur verið hlaðið upp nú þegar." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 @@ -468,9 +471,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 +507,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 +525,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 "Upplýsingar" @@ -548,5 +551,5 @@ msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -555,10 +558,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -567,5 +570,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 +577,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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,77 +634,61 @@ msgstr "" -#: ../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 "Sameina vegi" -#: ../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 "Sameina marga vegi í einn." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Sameina vegi sem eru stak í mismunandi venslum?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Sameina þá" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " +"það?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Skipta um átt?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Skipta um átt og sameina" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Vegirnir sem eru valdir gátu ekki verið sameinaðir þannig að áttir þeirra " +"haldist sér. Vilt þú skipta um átt sumra þeirra?" + +#: ../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 "" +"Gat ekki sameinað vegi: Einhverjir þeirra voru aðskildir en til að hægt sé " +"að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Sameina {0} vegi" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Sameina vegi sem eru stak í mismunandi venslum?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Sameina þá" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " -"það?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Skipta um átt?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Skipta um átt og sameina" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Vegirnir sem eru valdir gátu ekki verið sameinaðir þannig að áttir þeirra " -"haldist sér. Vilt þú skipta um átt sumra þeirra?" - -#: ../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 "" - -#: ../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 "Leysa árekstra" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Sameina {0} vegi" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Gat ekki sameinað vegi: Einhverjir þeirra voru aðskildir en til að hægt sé " -"að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -755,5 +742,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 "Fjarlægja" @@ -763,15 +750,15 @@ msgstr "Eyða völdum hlutum." -#: ../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 "Yfirskrifa" -#: ../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 "Þessi skrá er þegar til. Yfirskrifa hana?" @@ -800,10 +787,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}" @@ -834,5 +821,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 @@ -1009,1028 +996,25 @@ msgstr "Sameina það lag sem nú er valið öðru lagi" -#: ../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 "Sameina hnúta" -#: ../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 "Sameina valda hnúta á staðsetningu þess elsta." -#: ../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 "Veldu minnst tvo hnúta til að sameina." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "" - -#: ../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 "" -"Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt fyrir " -"það?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Spegla" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Spegla valda hnúta og vegi." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Færa {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "" - -#: ../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 "" - -#: ../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 "Ný" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Skapa nýtt kort." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Opna..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Opna skrá." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Opna skrá." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Óþekkt hlutverk \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Opna slóð..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Opna slóð (URL)" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Aðskilið lag" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Sláðu inn slóð (URL) skrárinnar sem þú vilt opna:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Opna slóð" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Niðurhala slóð" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Hornrétta form" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../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 "Aðeins einn hnútur valinn" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Hornrétta" - -#: ../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 "Líma" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Líma innihald klemmuborðsins." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Líma eigindi" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti." - -#: ../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 -#, 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 "Stillingar" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Sýna stillingar fyrir ritilinn." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Stillingar" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Endurtaka" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Endurtaka afturkallaða aðgerð." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Endurnefna lag" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Endurnefna skránna líka" - -#: ../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 "Skipta um átt vega" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Skipta um átt allra valdra vega." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Skipta um átt vega" - -#: ../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 "Vista" - -#: ../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 "Vista þau gögn sem sjást núna." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Skráin {0} er þegar til. Yfirskrifa hana?" - -#: ../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ómt skjal" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Árekstrar" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Vista OSM skrá" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Vista GPX skrá" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "" - -#: ../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 "Vista sem..." - -#: ../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 "Vista þau gögn sem sjást núna í nýja skrá." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Velja allt" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Sýna stöðuskýrslu" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Sýna stöðuskýrslu með nytsamlegum upplýsingum sem hægt er að hengja við " -"villutilkynningar" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Stöðuskýrsla" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Afrita á klemmuborðið og loka" - -#: ../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 "Loka" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Skipta veg" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Skipta veg á völdum hnút(um)." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "" - -#: ../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] "" -msgstr[1] "" - -#: ../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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "" - -#: ../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] "" -msgstr[1] "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "Skipta veginum {0} í {1} hluta" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Loka breytingasetti..." - -#: ../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 "Loka breytingasetti..." - -#: ../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 "Opna breytingasett..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Loka breytingasetti..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Teikna línu á milli GPS punkta." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Aðskilja vegi" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Skipta upp hnút sem er notaður af mörgum vegum." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Afturkalla" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Afturkalla síðustu aðgerð." - -#: ../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 "Afvelja allt" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Afvelja alla hluti." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Uppfæra gögn" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir þau." - -#. 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 "Uppfæri gögn" - -#: ../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 "Uppfæra val" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Upphala til OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Upphala öllum breytingum á OSM þjóninn." - -#: ../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 "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Engar breytingar til að hlaða upp." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Hlaða upp breytingum?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Hlaða upp breytingum" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Breyti nýjum venslum í laginu „{0}“" - -#: ../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 "Bætti hnút við veg sem til var fyrir" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "senda allar breytingarnar í einu á þjónin" - -#: ../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 "" -"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef " -"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Kortastillingar" - -#: ../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 "Hlutum sem verður bætt við:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Hlutum sem verður breytt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Hlutum sem verður eytt:" - -#: ../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] "Hlutum sem verður bætt við:" -msgstr[1] "Hlutum sem verður bætt við:" - -#: ../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] "Hlutum sem verður breytt:" -msgstr[1] "Hlutum sem verður breytt:" - -#: ../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] "Hlutum sem verður eytt:" -msgstr[1] "Hlutum sem verður eytt:" - -#: ../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 "Síðast breytt {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Þysja inn" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Þysja út" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Næsti punktur" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Spila næsta punkt." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Fyrri punktur" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Sæki GPS gögn" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Niðurhöluð GPX gögn" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "GPS gögn" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Sæki gögn" - -#: ../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 "Ekki var náð í nein gögn" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap gögn" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Niðurhal {0} af {1} ({2} eftir)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Eyða hnútum eða vegum" - -#: ../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 "" - -#: ../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 @@ -2041,7 +1025,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 @@ -2050,6 +1035,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 @@ -2080,4 +1065,870 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Spegla" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Spegla valda hnúta og vegi." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Færa {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "" + +#: ../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 "" + +#: ../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 "Ný" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Skapa nýtt kort." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Opna..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Opna skrá." + +#: ../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 "Opna slóð..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Opna slóð (URL)" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Aðskilið lag" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Sláðu inn slóð (URL) skrárinnar sem þú vilt opna:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Opna slóð" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Niðurhala slóð" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Hornrétta form" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" + +#: ../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 "Aðeins einn hnútur valinn" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Hornrétta" + +#: ../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 "Líma" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Líma innihald klemmuborðsins." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Líma eigindi" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti." + +#: ../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 "Stillingar" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Sýna stillingar fyrir ritilinn." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Stillingar" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Endurtaka" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Endurtaka afturkallaða aðgerð." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Endurnefna lag" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Endurnefna skránna líka" + +#: ../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 "Skipta um átt vega" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Skipta um átt allra valdra vega." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Skipta um átt vega" + +#: ../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 "Vista" + +#: ../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 "Vista þau gögn sem sjást núna." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Skráin {0} er þegar til. Yfirskrifa hana?" + +#: ../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ómt skjal" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Árekstrar" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Vista OSM skrá" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Vista GPX skrá" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "" + +#: ../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 "Vista sem..." + +#: ../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 "Vista þau gögn sem sjást núna í nýja skrá." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Velja allt" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Sýna stöðuskýrslu" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Sýna stöðuskýrslu með nytsamlegum upplýsingum sem hægt er að hengja við " +"villutilkynningar" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Stöðuskýrsla" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Afrita á klemmuborðið og loka" + +#: ../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 "Loka" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Skipta veg" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Skipta veg á völdum hnút(um)." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "" + +#: ../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] "" +msgstr[1] "" + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "" + +#: ../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] "" +msgstr[1] "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "Skipta veginum {0} í {1} hluta" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Loka núverandi breytingarsetti" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Loka núverandi breytingarsetti ..." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Teikna línu á milli GPS punkta." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Aðskilja vegi" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Skipta upp hnút sem er notaður af mörgum vegum." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Afturkalla" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Afturkalla síðustu aðgerð." + +#: ../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 "Afvelja allt" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Afvelja alla hluti." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Uppfæra gögn" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir þau." + +#. 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 "Uppfæri gögn" + +#: ../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 "Uppfæra val" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Upphala til OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Upphala öllum breytingum á OSM þjóninn." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Engar breytingar til að hlaða upp." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Hleð upp gögnum úr laginu „{0}“" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Þysja inn" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Þysja út" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Næsti punktur" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Spila næsta punkt." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Fyrri punktur" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Sæki GPS gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Niðurhöluð GPX gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "GPS gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Sæki gögn" + +#: ../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 "Ekki var náð í nein gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Niðurhal {0} af {1} ({2} eftir)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Eyða hnútum eða vegum" + +#: ../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 "" + +#: ../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 @@ -2190,18 +2041,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 "Val" -#: ../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 "Velja, færa og snúa hlutum" -#: ../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" @@ -2210,18 +2061,18 @@ 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 "Færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Ekki færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2229,9 +2080,6 @@ "Really move them?" msgstr "" -"Þú færðir meira en {0} hluti. Óreyndir notendur færa oft marga hluti fyrir " -"slysni.\n" -"Ert þú viss um að þú viljir færa þessa hluti?" - -#: ../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 "" @@ -2353,7 +2201,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - Hlutur með gefið kenni (e. „id“)" +msgstr "id:... - hlutur með þessa kennitölu (0 fyrir nýja hluti)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2406,41 +2253,41 @@ msgstr "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Hefja leit" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "stafsetursónæmt" -#: ../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 "" @@ -2450,40 +2297,42 @@ 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 "" -#: ../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 +"Óþekkt gerð hlutar „{0}“. Þekktar gerðir eru node, way og relation fyrir " +"hnút, veg og vensl" + +#: ../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 "" @@ -2492,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." @@ -2527,7 +2376,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Bæta við hnút" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2537,22 +2386,22 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Vensl: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Breyta {0} hlut" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Síðast breytt {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Breyta venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -2652,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] "Breyta {0} hlut" -msgstr[1] "Breyta {0} hlutum" +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] "Færði {0} hnút" -msgstr[1] "Færði {0} hnúta" +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] "Eyða laginu" -msgstr[1] "Eyða laginu" +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] "Fjarlægja úr venslum" -msgstr[1] "Fjarlægja úr venslum" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2689,18 +2538,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n" -"Eyða úr venslunum?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" -msgstr "Valið „{0}“ er notað af venslunum „{1}“." +msgstr "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2711,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." @@ -2790,17 +2637,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2810,17 +2657,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Leysa {0} árekstra í {1} hlutum" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3025,5 +2872,5 @@ msgstr "A" -#: ../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 @@ -3031,23 +2878,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 +#, java-format +msgid "paramete''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Villa: {0}" -#: ../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 "Viðvörun: {0}" -#: ../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 @@ -3060,11 +2932,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 "" @@ -3115,9 +2992,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." @@ -3126,118 +3003,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 "Óþekkt hlutverk \"{0}\"." -#: ../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 "" @@ -3260,5 +3137,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" @@ -3269,5 +3146,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" @@ -3278,5 +3155,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" @@ -3385,5 +3262,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "" @@ -3415,127 +3292,33 @@ msgstr[1] "{0} stök" -#: ../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 "óskilgreint" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "" -#: ../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 "" @@ -3746,5 +3529,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}" @@ -3858,9 +3641,9 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 msgid "false: the property is explicitly switched off" -msgstr "" +msgstr "Villa: Slökkt er á eigindum" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91 msgid "true: the property is explicitly switched on" -msgstr "" +msgstr "Í lagi: Kveikt er á eigindum" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96 @@ -4121,4 +3904,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 @@ -4190,8 +3975,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 @@ -4314,5 +4099,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 "" @@ -4372,5 +4157,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 "" @@ -4412,4 +4197,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 @@ -4423,5 +4209,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 "" @@ -4527,4 +4313,39 @@ 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 +msgid "No conflicts to resolve" +msgstr "" + +#: ../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 "Vista" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4537,24 +4358,23 @@ msgstr "" -#: ../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 "Veldu lit" - -#: ../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}''" @@ -4575,14 +4395,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 "Óútfært." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4591,12 +4412,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "af vegi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Fjarlægja úr venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4624,24 +4443,8 @@ msgstr[1] "{0} vensl" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Breyta upplausn" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Leysa árekstra" - -#: ../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 "Vista" - #: ../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 "Líma" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4656,9 +4459,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} vegur" -msgstr[1] "{0} vegir" +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 "Fjarlægja val úr venslunum" + +#: ../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 "Eldstæði" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "<óskilgreint>" + +#. --- 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 "Hlutverk:" + +#: ../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 "Gildi" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Útgáfa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4685,5 +4553,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,8 +4582,8 @@ #: ../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." -msgstr "" +msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 @@ -4785,13 +4653,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 "Lag: {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 "Vensl: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4877,5 +4745,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 "" @@ -4934,5 +4802,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 "Bæta við" @@ -4982,5 +4850,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 "Vensl" @@ -5027,5 +4895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Refresh the selection list." -msgstr "" +msgstr "Endurhlaða vallistann" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159 @@ -5075,9 +4943,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] "Notandi" -msgstr[1] "Notandi" +msgstr[0] "{0} notandi" +msgstr[1] "{0} notendur" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5086,12 +4954,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Sýna" +msgstr "Skoða notandasíðu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Frekari upplýsingar um þessa forstillingu" +msgstr "Sýna notandasíðu þessa notanda á openstreetmap.org" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5172,5 +5038,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}" @@ -5189,9 +5055,4 @@ msgid "Child Relations" msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Hlutverk:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5441,11 +5302,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 "" @@ -5459,7 +5320,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Hleð inn viðbótum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5566,5 +5426,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." -msgstr "" +msgstr "Núll bendill, hugsanlega vantar eigindi." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 @@ -5584,5 +5444,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Staðir" @@ -5660,9 +5520,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Þysja: Notið músarhjól eða tvísmellið. Færa kort: Hægrismellið og hreyfið " +"músina. Velja: Smellið" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5692,17 +5555,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Breytingaskrá: {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Breytingaskrá: {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Breytingaskrá: {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5711,7 +5574,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Sýna breytingasögu valdra hluta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5749,17 +5611,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6594,78 +6456,74 @@ #: 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 "Heiti" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Útgáfa {0} búin til {1} af " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Breyta venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Frekari upplýsingar um þessa forstillingu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Síðast breytt {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6683,7 +6541,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nafn götu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6724,7 +6581,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Veldu gildi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6773,5 +6629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6789,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 "" @@ -6806,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 "" @@ -6818,7 +6674,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Hunsa og hætta" +msgstr "Gleyma og eyða" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6831,7 +6686,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Vista og hætta" +msgstr "Vista og eyða" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6917,12 +6771,151 @@ #: ../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 "Opna nýtt breytingarsett og loka því strax" + +#: ../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 "" +"Nýtt breytingarsett verður búið til og því lokað eftir að breytingunni hefur " +"verið upphlaðið" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "Opna nýtt breytingarsett og skilja það eftir opið" + +#: ../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 "" +"Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé að " +"bæta við frekari breytingum síðar meir" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 +msgid "Upload to a new or to an existing changeset?" +msgstr "Hlaða upp sem nýju breytingarsetti eða bæta við eldra?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "senda allar breytingarnar í einu á þjónin" + +#: ../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 "" +"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef " +"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Stillingar" + +#: ../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 "Tögg fyrir nýtt breytingarsett" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Hlutum sem verður bætt við:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Hlutum sem verður breytt:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Hlutum sem verður eytt:" + +#: ../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] "{0} hlut verður bætt við:" +msgstr[1] "{0} hlutum verður bætt við:" + +#: ../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] "{0} hlut verður breytt:" +msgstr[1] "{0} hlutum verður breytt:" + +#: ../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] "{0} hlut verður eytt:" +msgstr[1] "{0} hlutum verður eytt:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Nota opið breytingarsett #{0} og loka því" + +#: ../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 "" +"Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að " +"breytingunni hefur verið upphlaðið" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið" + +#: ../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 "" +"Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið " +"svo hægt sé að bæta við frekari breytingum síðar meir" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Tögg á breytingarsetti #{0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Hlaða upp breytingum" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Skrá" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Hlaða upp breytingum?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Endurhlaða" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Sláðu inn nafn fyrir staðsetningu." + +#: ../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 @@ -7159,5 +7152,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." @@ -7211,7 +7203,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Sæki gögn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7272,4 +7263,10 @@ msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7456,5 +7453,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 "Veldu hlut til að eyða fyrst." @@ -7909,7 +7906,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Sýna kenni hluta í vallistum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7924,7 +7920,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Sýna kenni hluta í vallistum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8276,8 +8271,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!" @@ -8334,5 +8325,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 @@ -8343,42 +8334,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Bæta við nýju lagi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Eyða völdu lagi." - -#: ../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 "Frekari upplýsingar um þessa forstillingu" #. 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 "Valfrjáls eigind:" -#: ../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 "Nota forstillinguna „{0}“ í flokknum „{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 "Nota forstillinguna „{0}“" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "" -#: ../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 @@ -8389,15 +8378,15 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 @@ -8407,18 +8396,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../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 "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Breyta eigindum" @@ -8445,5 +8434,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 "Tómur bendill, hugsanvega vantar einhver eigindi." @@ -8459,7 +8447,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 @@ -8533,5 +8518,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}" @@ -8539,5 +8524,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" @@ -8545,5 +8530,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" @@ -8564,6 +8548,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 @@ -8573,40 +8557,40 @@ msgstr "Hala niður OSM gögnum..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Breyti venslum #{0} í laginu „{1}“" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../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 " @@ -8668,10 +8652,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 "" @@ -8679,11 +8663,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 "Opna breytingasett..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +msgstr "Bý til breytingarsett..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293 #, java-format msgid "Successfully opened changeset {0}" @@ -8691,34 +8673,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 "Opna breytingasett..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Opna breytingasett..." - -#: ../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 "Opna breytingasett..." - -#: ../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 " @@ -8726,44 +8692,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../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 "Loka breytingasetti..." - -#: ../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 "Opna breytingasett..." - -#: ../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 "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Hleð upp gögnum..." -#: ../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}." @@ -8782,10 +8748,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 "" @@ -8844,6 +8810,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 "" @@ -8872,5 +8843,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 "" @@ -8927,74 +8898,139 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Óþekkt útgáfa" - -#: ../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 "Atriði merkt \"{0}\" vantar" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Óþekkt útgáfa: {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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "" - -#: ../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 "" -#: ../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 "Ógildur hlutur með kenni=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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Óþekkt útgáfa: {0}" + +#: ../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 "Atriði merkt \"{0}\" vantar" #: ../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 "" @@ -9003,16 +9039,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 "Undirbý OSM gögn..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Illa-formað kenni á hnút" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Undirbý OSM gögn..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Undirbý gögn..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9058,33 +9108,43 @@ "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína." -#: ../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} búið. Hleð upp: {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} búið. Hleð upp: {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} búið. Hleð upp: {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 "Hleð upp gögnum..." + +#: ../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 "senda allar breytingarnar í einu á þjónin" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9126,11 +9186,6 @@ msgstr "Niðurhel {0}..." -#: ../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 "" @@ -9143,4 +9198,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 @@ -9180,20 +9240,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 "Gera viðbótina óvirka" #: ../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 "Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java: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 " @@ -9203,5 +9263,9 @@ "yfirskrifa núverandi viðbætur." -#: ../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 "" @@ -9209,19 +9273,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 " @@ -9229,13 +9293,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" @@ -9292,4 +9356,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 "óskilgreint" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9365,4 +9460,88 @@ msgstr "Textinn hefur verið þegar verið afritaður" +#: ../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 @@ -9432,5 +9611,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9439,5 +9618,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9446,5 +9625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9453,5 +9632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9460,5 +9639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9517,39 +9696,39 @@ msgstr "Upphala ferlum" -#: ../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 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +#: ../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 "Lýsing" -#: ../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}" @@ -9557,47 +9736,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 "Upphal gagna tókst ekki. Þjónnin skilaði eftirfarandi villuböðum: " -#: ../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 "" @@ -9806,5 +9985,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 "" @@ -9818,13 +9997,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 "" @@ -9833,9 +10012,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 "" @@ -9844,65 +10023,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 " @@ -9910,13 +10089,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 "" @@ -9954,5 +10133,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 "" @@ -9999,13 +10178,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" @@ -10014,13 +10193,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 "" @@ -10130,9 +10309,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 "" @@ -10285,7 +10464,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Val" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10369,5 +10547,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 "Tómt lag" @@ -11289,18 +11467,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}" @@ -11311,5 +11489,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 " @@ -11317,9 +11495,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 "" @@ -11330,28 +11508,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Eyða völdum hlutum." + +#: ../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 " @@ -11360,28 +11543,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 "" @@ -11872,25 +12061,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Leysa árekstra" + #: ../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 "" @@ -11962,6 +12159,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 "Villur sem fundust við athugun" @@ -11971,10 +12168,10 @@ msgstr "Engar villur fundust við athugun" -#: ../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 "" @@ -12061,51 +12258,65 @@ msgstr "Athuga gögnin" -#: ../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 "Gögnin stóðust ekki athugun. Upphala þrátt fyrir það?" -#: ../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 "Opna athugunarglugga." -#: ../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 "Þysja að vandamálinu" -#: ../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 "Laga" -#: ../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 "Laga valdar villur." -#: ../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 "Hunsa" -#: ../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 "Hunsa viðkomandi villu við næstu staðreyningu" -#: ../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 "Uppfæri gögn" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12137,7 +12348,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "bygging" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12145,18 +12355,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 "" @@ -12164,7 +12374,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 "Hnútur endurtekinn í vegi" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12175,7 +12384,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Hnútur endurtekinn í vegi" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12740,5 +12948,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12822,5 +13030,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 " @@ -12828,5 +13036,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 "" @@ -12844,17 +13052,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 "" @@ -12898,15 +13106,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -12917,109 +13125,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 "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../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 "Vista WMS lag í skrá" -#: ../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 "Hlaða WMS lag úr skrá" -#: ../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 "Stillingar fyrir WMS viðbótina" -#: ../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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Afrita sjálfgefið val á minn lista" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Veldu hlut til að afrita fyrst." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Niðurhalsforrit:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13384,5 +13602,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 "Tilvísun" @@ -13924,7 +14142,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Fjallakofi (e. Chalet)" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -13945,8 +14162,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 "Leiga" +msgstr "" #. color heath @@ -13964,5 +14180,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 "skógur" @@ -13975,7 +14192,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "bílastæðavegur" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14011,7 +14227,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "götusteinn" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14022,7 +14237,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "óklárað" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14226,4 +14440,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" @@ -14252,12 +14467,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 "já" #. color permissive -#. +#. #. 1 #. 40000 @@ -14305,5 +14520,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14340,5 +14555,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14402,6 +14617,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 "nei" @@ -14547,6 +14763,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 "Gerð" @@ -14817,7 +15033,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Göngugata" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14836,7 +15051,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Tálmar" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15128,7 +15342,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 "Rekstraraðili" @@ -15341,6 +15555,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 "Hæð (y/s)" @@ -16252,7 +16466,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" @@ -16300,23 +16511,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 "Opnunartími" @@ -16340,5 +16551,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" @@ -16385,22 +16595,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 "" @@ -16415,22 +16625,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 "" @@ -16445,22 +16655,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 "" @@ -16494,5 +16704,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 "Tilvísun" @@ -16512,7 +16722,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Merkja sem klárað" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16740,5 +16949,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Skýli" @@ -16930,9 +17139,9 @@ #: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" -msgstr "" +msgstr "pizza" #: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" -msgstr "" +msgstr "hamborgarar" #: build/trans_presets.java:1620 build/trans_presets.java:1628 @@ -16950,5 +17159,5 @@ #: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" -msgstr "" +msgstr "að hætti heimamanna" #: build/trans_presets.java:1620 build/trans_presets.java:1628 @@ -17123,7 +17332,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "til" +msgstr "" #. color tertiary @@ -17166,28 +17374,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "kínversk" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Niðurhalssvæði" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Líma" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Borg" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "Svæði" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17215,7 +17418,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Gosbrunnur" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17229,7 +17431,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "bygging" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17246,13 +17447,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Landamæraeftirlit" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Lögreglustöð" +msgstr "" #: build/trans_presets.java:1737 @@ -17269,7 +17468,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "land" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17280,19 +17478,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Upplýsingar" +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 "Nánari lýsing" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Hljóð" +msgstr "" #. @@ -17303,7 +17498,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Húsnúmer" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17627,5 +17821,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17659,5 +17853,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18783,6 +18977,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 "" @@ -18791,66 +18985,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -18859,76 +19053,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19260,5 +19454,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 "Athugasemd" @@ -19283,5 +19477,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 "Mynt" @@ -19289,5 +19483,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 "Athugasemd" @@ -19295,5 +19489,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 "" @@ -19301,5 +19495,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 "Debetkort" @@ -19307,5 +19501,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 "Kreditkort" @@ -19364,10 +19558,143 @@ msgstr "Bekkur" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Tálmar" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Minnisvarði" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "Aldrei" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Grunnupplýsingar" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Litur" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "strönd" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "Bær" + +#. 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 "" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Gildi" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "vatn" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Fjöldi víra" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19376,30 +19703,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 "Hæð" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Gosbrunnur" @@ -19408,10 +19735,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Breyti gosbrunn" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Drykkjarvatn" @@ -19420,10 +19747,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Breyti drykkjarvatni" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Barnalúga" @@ -19431,35 +19758,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Breyti barnalúgu" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Verslanir" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Fjallakofi (e. Chalet)" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19467,9 +19792,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Sjoppa" @@ -19477,29 +19802,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Breyti sjoppu" -#: 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 "Breyti strætóstoppi" - -#: 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 "Breyti tré" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Sjálfsali" @@ -19507,5 +19830,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "" @@ -19513,88 +19836,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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "dagblöð" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "dót" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "Slátrari" @@ -19602,9 +19925,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Breyti slátrara" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Bakarí" @@ -19612,9 +19935,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Breyti bakaríi" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Blómabúð" @@ -19622,18 +19945,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Breyti blómabúð" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Lífræn búð" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Breyti lífrænni búð" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19641,54 +19964,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Vínbúð" #. 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 "Tölvubúð" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Breyti tölvubúð" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Raftækjabúð" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Breyti raftækjabúð" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hljómtækjaverslun" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Breyti hljómtækjaverslun" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Húsgagnaverslun" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Breyti húsgagnaverslun" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19696,9 +20019,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19706,9 +20029,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19716,54 +20039,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 "Skrifstofuvörur" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Breyti skrifstofuvörum" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Hársnyrtir" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Breyti hársnyrti" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Skóbúð" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Breyti skóbúð" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Dótabúð" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Breyti dótabúð" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Efnalaug" @@ -19771,9 +20094,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Breyti efnalaug" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Þvottahús" @@ -19781,9 +20104,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Breyti þvottahúsi" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Útivistarbúð" @@ -19791,32 +20114,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Breyti útivistarbúð" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Breyti sjóntækjasmið" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Fjármál" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banki" @@ -19824,14 +20147,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Breyti banka" -#: 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 "Hraðbanki" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Gjaldeyrisskipti" @@ -19839,5 +20162,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Breyti gjaldeyrisskiptum" @@ -19845,15 +20168,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Breyti hraðbanka" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Heilsa" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Læknir" @@ -19861,18 +20184,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Breyti lækni" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Tannlæknir" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Breyti tannlækni" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apótek" @@ -19880,5 +20203,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Apótek" @@ -19886,9 +20209,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Spítali" @@ -19896,10 +20219,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Breyti spítala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -19908,5 +20231,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -19915,20 +20238,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "" #. 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 "" @@ -19936,5 +20259,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 "Dýralæknir" @@ -19943,55 +20266,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Breyti dýralækni" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Heimsálfa" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Breyti heimsálfu" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Breyti landi" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Fylki" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Breyti fylki" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Svæði" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Breyti svæði" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Sýsla" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Breyti sýslu" @@ -19999,15 +20322,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Borg" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Breyti borg" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Bær" @@ -20015,10 +20338,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Breyti bæ" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Hverfi" @@ -20026,25 +20349,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Breyti hverfi" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Þorp" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Breyti þorpi" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Smáþorp" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Breyti smáþorpi" @@ -20052,5 +20375,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20058,10 +20381,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Eyja" @@ -20069,24 +20392,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Breyti eyju" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "skali" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Hellismunni" @@ -20094,10 +20415,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Breyti hellismunna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Tindur" @@ -20105,10 +20426,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Breyti tind" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Jökull" @@ -20116,10 +20437,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Breyti jökli" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Eldfjall" @@ -20127,70 +20448,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Breyti eldfjalli" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Landamæri" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Breyti landamærum þjóðgarðs" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Landnýting" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Tré" @@ -20199,15 +20520,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Breyti tré" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Fræðiheiti" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Skógur" @@ -20216,5 +20537,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Breyti skóg" @@ -20222,17 +20543,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 "barrskógur" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "laufskógur" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "blandaður" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Skógur (ræktaður)" @@ -20241,14 +20562,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Breyti ræktuðum skóg" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20256,25 +20577,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20282,10 +20603,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20293,5 +20614,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20299,5 +20620,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20306,45 +20627,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20352,25 +20673,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Garður" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Breyti garði" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20378,10 +20699,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20389,20 +20710,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Almenningsgarður" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Breyti almenningsgarð" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20410,5 +20731,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20416,15 +20737,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Íbúðarsvæði" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Breyti íbúðarlandnýtingu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Grafreitur" @@ -20432,9 +20753,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Breyti grafreit" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "" @@ -20442,39 +20763,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Breyti kirkjugarðslandnýtingu" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Smásala" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Breyti smásölulandnýtingu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Skrifstofur" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Breyti skrifstofulandnýtingu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Iðnaður" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Breyti iðnaðarlandnýtingu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20482,15 +20803,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20498,55 +20819,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Byggingarsvæði" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Breyti byggingarsvæðislandnýtingu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20556,5 +20877,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 "" @@ -20563,10 +20884,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20574,5 +20895,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20581,5 +20902,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20587,34 +20908,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "aðeins_beint_fram" @@ -20623,15 +20944,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "af vegi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "gegnum hnút eða veg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "að vegi" @@ -20639,5 +20960,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20646,5 +20967,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20652,5 +20973,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20658,5 +20979,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20722,5 +21043,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 @@ -20729,17 +21050,17 @@ msgstr "hjól" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20792,5 +21113,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 @@ -20799,13 +21120,13 @@ msgstr "fótgangandi" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20819,10 +21140,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20830,31 +21151,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20863,30 +21184,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24039,76 +24360,4 @@ msgstr "" -#. 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 "" - #. color green #. @@ -25076,44 +25325,30 @@ msgstr "" -#~ msgid "nodes" -#~ msgstr "hnútar" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" - -#~ msgid "Delete all" -#~ msgstr "Eyða öllum lögunum" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Eyði lagi {0} af {1}" - -#~ msgid "Public" -#~ msgstr "Sýnilegur öllum" - -#~ msgid "Selected makes your trace public in openstreetmap.org" +#. 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 "Merge nodes with different memberships?" +#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á " -#~ "openstreetmap.org" - -#~ msgid "Edit Information Office" -#~ msgstr "Breyti upplýsingamiðstöð" - -#~ msgid "Map Type" -#~ msgstr "Gerð korts" - -#~ msgid "map" -#~ msgstr "kort" - -#~ msgid "citymap" -#~ msgstr "borgarkort" - -#~ msgid "hikingmap" -#~ msgstr "göngukort" - -#~ msgid "bicyclemap" -#~ msgstr "hjólakort" - -#~ msgid "Board Type" -#~ msgstr "Viðfangsefni skiltisins" +#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt " +#~ "fyrir það?" + +#~ msgid "Unknown version" +#~ msgstr "Óþekkt útgáfa" + +#~ msgid "Ill-formed node id" +#~ msgstr "Illa-formað kenni á hnút" #~ msgid "Aborting..." @@ -25144,7 +25379,4 @@ #~ "reyna síðar." -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Fjarlægja val úr venslunum" - #~ msgid "Email" #~ msgstr "Netfang" @@ -25186,11 +25418,4 @@ #~ msgstr "Fjarlægja val" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Þysja: Notið músarhjól eða tvísmellið. Færa kort: Hægrismellið og hreyfið " -#~ "músina. Velja: Smellið" - #~ msgid "Revert" #~ msgstr "Afturkalla" @@ -25214,7 +25439,39 @@ #~ msgstr "Gengt af" +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á " +#~ "openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Sýnilegur öllum" + #~ msgid "Charge" #~ msgstr "Gjaldtaka" +#~ msgid "Edit Information Office" +#~ msgstr "Breyti upplýsingamiðstöð" + +#~ msgid "Board Type" +#~ msgstr "Viðfangsefni skiltisins" + +#~ msgid "Map Type" +#~ msgstr "Gerð korts" + +#~ msgid "bicyclemap" +#~ msgstr "hjólakort" + +#~ msgid "citymap" +#~ msgstr "borgarkort" + +#~ msgid "hikingmap" +#~ msgstr "göngukort" + +#~ msgid "map" +#~ msgstr "kort" + +#~ msgid "nodes" +#~ msgstr "hnútar" + #~ msgid "Move Up" #~ msgstr "Færa upp" @@ -25234,7 +25491,4 @@ #~ msgid "linked" #~ msgstr "tengd" - -#~ msgid "Basic" -#~ msgstr "Grunnupplýsingar" #~ msgid "" @@ -25242,2 +25496,11 @@ #~ "layer?" #~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Eyði lagi {0} af {1}" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" + +#~ msgid "Delete all" +#~ msgstr "Eyða öllum lögunum" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 17594) +++ /applications/editors/josm/i18n/po/it.po (revision 17595) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-08-20 09:04+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-11 18:38+0000\n" +"Last-Translator: FabC \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,8 +13,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:04+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" @@ -22,5 +22,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 @@ -29,5 +29,5 @@ msgstr "Aiuto" -#: ../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" @@ -35,13 +35,15 @@ "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore" -#: ../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 @@ -57,8 +59,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 @@ -72,6 +74,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 @@ -81,5 +83,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 @@ -99,13 +101,13 @@ #: ../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 "Errore" -#: ../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?" @@ -113,42 +115,41 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" -"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" +"Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti e " +"continuare?" msgstr[1] "" -"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +"Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti e " +"continuare?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Modifiche non salvate" -#: ../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 "Salva ed Esci" -#: ../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 "Annulla ed Esci" -#: ../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 +158,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 +177,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 "Annulla" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{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 +207,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,15 +246,17 @@ msgstr "Attenzione" -#: ../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 "Ignorato un indirizzo URL di file malformato: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Impossibile leggere il file ''{0}''. L''errore è:
{1}" +msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -339,5 +343,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 "Estensioni" @@ -352,22 +356,21 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"ATTENZIONE: formato inatteso per l' URL di base delle API. Il " -"reindirizzamento della pagina della storia delle primitive di OSM " -"probabilmente non funzionerà. L' URL di base per le api è: {0}" +"ATTENZIONE: formato URL base dell'API inatteso. Il reindirizzamento alla " +"pagina di informazioni o dello storico delle primitive OSM probabilmente " +"fallirà. L'URL di base delle API è: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"ATTENZIONE: formato inatteso per l' URL di base delle API. Il " -"reindirizzamento della pagina della storia delle primitive di OSM " -"probabilmente non funzionerà. L' URL di base per le api è: {0}" +"ATTENZIONE: formato URL base dell'API inatteso. Il reindirizzamento alla " +"pagina utente OSM probabilmente fallirà. L'URL di base delle API è: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -477,9 +480,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 @@ -513,6 +516,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 @@ -531,11 +534,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 "Informazioni" @@ -557,5 +560,5 @@ msgstr "Selezionare almeno tre nodi." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -566,10 +569,10 @@ "sono {0}, il massimo è {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 "Violazione delle capacità delle API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -580,5 +583,5 @@ "cancellata {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -589,9 +592,9 @@ "massima lunghezza ammessa {2}. La lunghezza del valore è {3}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Violazione della precondizione" -#: ../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}" @@ -648,77 +651,61 @@ msgstr "Nessun conflitto da ingrandire" -#: ../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 "Unisci percorso" -#: ../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 "Unisce diversi percorsi in uno." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Unire i percorsi con diverse appartenenze?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Unisci comunque" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " +"unirli?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Inverti direzione?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Inverti direzione e unisci" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"I percorsi non possono essere uniti con le direzioni attuali. Vuoi invertire " +"la direzione di qualcuno?" + +#: ../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 "" +"Impossibile unire le way (non possono essere fuse in una singola stringa di " +"nodi)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Unisci {0} percorsi" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Unire i percorsi con diverse appartenenze?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Unisci comunque" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " -"unirli?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Inverti direzione?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Inverti direzione e unisci" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"I percorsi non possono essere uniti con le direzioni attuali. Vuoi invertire " -"la direzione di qualcuno?" - -#: ../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 "Inserire dei valori per tutti i conflitti." - -#: ../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 "Risolvi conflitti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Unisci {0} percorsi" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Tutti i percorsi erano vuoti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Impossibile unire le way (non possono essere fuse in una singola stringa di " -"nodi)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -774,5 +761,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 "Cancella" @@ -782,15 +769,15 @@ msgstr "Cancella gli oggetti selezionati." -#: ../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 "Sovrascrivi" -#: ../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 "Il file esiste. Sovrascriverlo?" @@ -819,10 +806,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}" @@ -855,5 +842,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 @@ -896,7 +883,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Tutte le immagini" +msgstr "Tutti i formati" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -926,5 +912,5 @@ #, java-format msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "" +msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -1036,1072 +1022,25 @@ msgstr "Unisci il livello corrente con un altro livello" -#: ../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 "Fondi nodi" -#: ../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 "Unisci i nuovi nodi in quello più vecchio." -#: ../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 "Seleziona almeno due nodi da unire." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Unire i nodi con diffenti appartenenze?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Incorpora comunque" - -#: ../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 "" -"I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Unisci {0} nodi" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Unisci selezione" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Unisci le primitive attualmente selezionate con un altro livello" - -#: ../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 "Rispecchia" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Rispecchia i nodi ed i percorsi selezionati." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Selezionare almeno un nodo o percorso." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "su" - -#: ../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 "Sposta oggetti {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "giù" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "sinistra" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "destra" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Muovi {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Sposta Oggetti {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 "Impossibile spostare degli oggetti fuori dal mondo." - -#: ../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 "Nuovo" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Crea una nuova mappa." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Apri..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Apri un file." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Apri un file." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Ruolo ''{0}'' sconosciuto." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Apri indirizzo URL..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Apri un indirizzo URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Livello separato" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Inserisci URL da scaricare:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Scarica indirizzo URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Scarica URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Disponi ortogonalmente" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "" -"Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Sono permessi solo due nodi" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "La selezione deve comprendere solo percorsi." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." - -#: ../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 "Solo un nodo selezionato" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Disponi ortogonalmente" - -#: ../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 "Incolla" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Incolla il contenuto memorizzato" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Incolla le etichette" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Caricamento {0}" -msgstr[1] "Caricamento {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Ripristina {0} primitive" -msgstr[1] "Ripristina {0} primitive" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferenze..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Apre una pagina di preferenze per le impostazioni globali." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferenze" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Rifai" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Rifa l'ultima azione annullata." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Rinomina livello" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Rinomina anche il file" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Impossibile rinominare il file ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Inverti la direzione dei percorsi" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Inverti la direzione di tutti i percorsi selezionati" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Selezionare almeno un precorso." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Inverti la direzione dei percorsi" - -#: ../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 "Salva" - -#: ../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 "Salva i dati attuali." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Il file {0} esiste. Sovrascrivere?" - -#: ../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 "Documento vuoto" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Il documento non contiene dati" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Salva comunque" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflitti" - -#: ../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 "" -"Ci sono conflitti non risolti. I conflitti non saranno salvati e verranno " -"gestiti come se si fossero stati tutti rifiutati. Continuare?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Rifiuta i conflitti e Salva" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Salva file OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Salva in un file GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Salva livello" - -#: ../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 "Salva come..." - -#: ../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 "Salva i dati correnti su un nuovo file." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Seleziona tutto" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Seleziona tutti gli oggetti recuperati nel livello dati. Seleziona anche " -"oggetti incompleti." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Visualizza il rapporto dello stato" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Visualizza il rapporto dello stato contenente informazioni utili che possono " -"essere allegate agli errori" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Aiuto: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Rapporto dello stato" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copia negli appunti e chiudi" - -#: ../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 "Chiudi" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Dividi percorso" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Divide un percorso al nodo selezionato." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "La selezione attuale non può essere usata per la divisione." - -#: ../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] "Il nodo selezionato non è parte di alcun percorso." -msgstr[1] "I nodi selezionati non sono parte di alcun percorso." - -#: ../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] "" -"C'è più di un percorso che utilizza il nodo selezionato. Selezionare anche " -"il percorso." -msgstr[1] "" -"C'è più di un percorso che utilizza i nodi selezionati. Selezionare anche il " -"percorso." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "I nodi selezionati non condividono il medesimo percorso." - -#: ../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] "Il percorso selezionato non contiene il nodo selezionato." -msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati." - -#: ../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 "Seleziona due o più nodi per dividere un percorso circolare." - -#: ../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 "" -"Il percorso non può essere diviso al nodo selezionato. (Suggerimento: " -"seleziona i nodi in mezzo al percorso)." - -#: ../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 "Dividi il percorso {0} in {1} parti" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Chiusura del gruppo di modifiche..." - -#: ../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 "Chiusura del gruppo di modifiche..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "Non c'è al momento alcun livello WMS da regolare." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Apertura del gruppo di modifiche..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Chiusura del gruppo di modifiche..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Visualizza/nascondi le linee GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Disegna le linee tra i punti GPS grezzi." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Attiva o disattiva l''impostazione globale ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Separa percorsi" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplica i nodi usati da più percorsi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Questo nodo non è attaccato ad altri elementi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Nessuno di questi nodi è attaccato ad altri elementi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "La selezione corrente non può essere utilizzata per la separazione." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Selezionare uno di questi:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Un nodo etichettato, oppure" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Un nodo che è usato da più di un percorso, oppure" - -#: ../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 "" -"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" - -#: ../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 "" -"* Un percorso che ha uno o più nodi che sono usati da più di un percorso, " -"oppure" - -#: ../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 "" -"* Un percorso ed uno o più dei suoi nodi che sono usati da più di un " -"percorso." - -#: ../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 "" -"Nota: Se un percorso è selezionato, questo percorso avrà delle copie dei " -"nodi separati\n" -"e questi nuovi nodi saranno selezionati. In caso contrario, tutti i percorsi " -"avranno la propria copia\n" -"e tutti i nodi saranno selezionati." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nodo staccato" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplica in {0} nodi" - -#. 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 "Duplica {0} nodi in {1} nodi" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Annulla" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Annulla l'ultima azione." - -#: ../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 "Deseleziona tutto" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Toglie la selezione da tutti gli oggetti." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Deseleziona tutto (al centro)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Deseleziona tutto (al di fuori)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Aggiorna dati" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Aggiorna i dati correnti del livello prelevandoli dal server (ri-scarica i " -"dati)" - -#. 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 "Aggiornamento dei dati" - -#: ../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 "Aggiorna la selezione" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Aggiorna le primitive attualmente selezionate dal server" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Selezione vuota" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Carica su OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Carica tutti i cambiamenti sul server OSM." - -#: ../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 "Ci sono dei conflitti non risolti. Prima è necessario risolverli." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Niente da caricare. Prima è necessario ottenere dei dati." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Nessun cambiamento da caricare." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Sincronizza solamente {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 "Sincronizza l'intero dataset" - -#: ../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 "" -"Caricamento fallito perché il server possiede una " -"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni.
Il " -"conflitto è stato causato da {0} con identificativo " -"{1},
il server possiede la versione {2}, la tua versione è {3}." -"

Cliccare {4} per sincronizzare solamente la " -"primitiva che causa il conflitto.
Cliccare {5} per " -"sincronizzare tutto l''insieme di dati locale con il server.
Cliccare " -"{6} per annullare e continuare ad apportare delle modifiche." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Rilevato un conflitto" - -#. 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 "Valore di ritorno inatteso. Ottenuto {0}" - -#: ../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 "" -"Caricamento fallito perché il server possiede una " -"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni." -"

Cliccare {0} per sincronizzare tutto l''insieme di " -"dati locale con il server.
Cliccare {1} per annullare e " -"continuare ad apportare delle modifiche.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Attenzione: l'intestazione dell' errore {0} non coincideva con il pattern " -"atteso \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Upload fallito.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Invio alle API di OSM fallito" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Aggiornamento della primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Caricare questi cambiamenti?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Carica le modifiche" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Modifica la nuova relazione nel layer ''{0}''" - -#: ../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 "Aggiungi un nodo ad un percorso esistente" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "carica tutte le modifiche in una sola richiesta" - -#: ../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 "" -"Abilitare per caricare tutte le modifiche in una sola richiesta, " -"disabilitare per utilizzare una richiesta per ogni singola primitiva " -"modificata" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Crea un breve commento ai cambiamenti che sta caricando:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Impostazioni della mappa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "gruppo di modifiche" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Oggetti da aggiungere:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Oggetti da modificare:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Oggetti da eliminare:" - -#: ../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] "Oggetti da aggiungere:" -msgstr[1] "Oggetti da aggiungere:" - -#: ../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] "Oggetti da modificare:" -msgstr[1] "Oggetti da modificare:" - -#: ../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] "Oggetti da eliminare:" -msgstr[1] "Oggetti da eliminare:" - -#: ../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 "Ultima modifica {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Ingrandisci" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Riduci" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Indietro" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Torna indietro" - -#: ../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 "Più veloce" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Avanti più veloce" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Avanti" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Salta Avanti" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Contrassegno successivo" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Esegui il contrassegno successivo" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Esegui/Pausa" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Esegui/Metti in pausa l'audio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Contrassegno precedente" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Esegui contrassegno precedente" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Più lento" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Avanzamento lento" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Scaricamento dei dati GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Scarica dati GPX" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Dati GPS grezzi" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Scaricamento dei dati" - -#: ../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 "Nessun dato importato." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Dati OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Scaricamento di {0} su {1} ({2} rimanenti)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Errori durante lo scaricamento" - -#: ../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 "Primitive eliminate o spostate" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Modalità Cancella" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Cancella nodi o percorsi." - -#: ../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 "Modalità: {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 "" -"Clicca per cancellare. Shift: cancella un segmento del percorso. Alt: non " -"cancellare i nodi inutilizzati quando elimini un percorso. Ctrl: cancella " -"gli oggetti che si riferiscono a questo." - +#: ../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 @@ -2112,7 +1051,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 @@ -2121,6 +1061,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 @@ -2151,4 +1091,921 @@ msgstr "il parametro ''{0}'' non deve essere nullo" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Unisci {0} nodi" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Unisci selezione" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Unisci le primitive attualmente selezionate con un altro livello" + +#: ../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 "Rispecchia" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Rispecchia i nodi ed i percorsi selezionati." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Selezionare almeno un nodo o percorso." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "su" + +#: ../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 "Sposta oggetti {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "giù" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "sinistra" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "destra" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Muovi {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Sposta Oggetti {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 "Impossibile spostare degli oggetti fuori dal mondo." + +#: ../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 "Nuovo" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Crea una nuova mappa." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Apri..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Apri un file." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Apertura dei file in corso" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Apertura del file \"{0}\" in corso..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Apri indirizzo URL..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Apri un indirizzo URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Livello separato" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Inserisci URL da scaricare:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Scarica indirizzo URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Scarica URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Disponi ortogonalmente" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "" +"Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Sono permessi solo due nodi" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "La selezione deve comprendere solo percorsi." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." + +#: ../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 "" +"Stai usando la proiezione EPSG:4326 che potrebbe portare
risultati " +"inattesi durante l'allineamento rettangolare.
Cambia la proiezione per " +"disattivare questo messaggio.
Continuare?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Solo un nodo selezionato" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Disponi ortogonalmente" + +#: ../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 "Incolla" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Incolla il contenuto memorizzato" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Incolla le etichette" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Incollo il tag {0}" +msgstr[1] "Incollo i tag {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "a {0} primitive" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Preferenze..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Apre una pagina di preferenze per le impostazioni globali." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferenze" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Rifai" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Rifa l'ultima azione annullata." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Rinomina livello" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Rinomina anche il file" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Impossibile rinominare il file ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Inverti la direzione dei percorsi" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Inverti la direzione di tutti i percorsi selezionati" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Selezionare almeno un precorso." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Inverti la direzione dei percorsi" + +#: ../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 "Salva" + +#: ../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 "Salva i dati attuali." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Il file {0} esiste. Sovrascrivere?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Non è stato trovato nessun Exporter! Nessun salvataggio." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Documento vuoto" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Salva comunque" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Il documento non contiene dati" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflitti" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Rifiuta i conflitti e Salva" + +#: ../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 "" +"Ci sono conflitti non risolti. I conflitti non saranno salvati e verranno " +"gestiti come se si fossero stati tutti rifiutati. Continuare?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Salva file OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Salva in un file GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Salva livello" + +#: ../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 "Salva come..." + +#: ../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 "Salva i dati correnti su un nuovo file." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Seleziona tutto" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Seleziona tutti gli oggetti recuperati nel livello dati. Seleziona anche " +"oggetti incompleti." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Visualizza il rapporto dello stato" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Visualizza il rapporto dello stato contenente informazioni utili che possono " +"essere allegate agli errori" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Aiuto: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Rapporto dello stato" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copia negli appunti e chiudi" + +#: ../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 "Chiudi" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Dividi percorso" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Divide un percorso al nodo selezionato." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "La selezione attuale non può essere usata per la divisione." + +#: ../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] "Il nodo selezionato non è parte di alcun percorso." +msgstr[1] "I nodi selezionati non sono parte di alcun percorso." + +#: ../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] "" +"C'è più di un percorso che utilizza il nodo selezionato. Selezionare anche " +"il percorso." +msgstr[1] "" +"C'è più di un percorso che utilizza i nodi selezionati. Selezionare anche il " +"percorso." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "I nodi selezionati non condividono il medesimo percorso." + +#: ../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] "Il percorso selezionato non contiene il nodo selezionato." +msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati." + +#: ../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 "Seleziona due o più nodi per dividere un percorso circolare." + +#: ../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 "" +"Il percorso non può essere diviso al nodo selezionato. (Suggerimento: " +"seleziona i nodi in mezzo al percorso)." + +#: ../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 "" +"Una relazione di appartenenza basata su un ruolo è stata copiata su " +"tutte le nuove strade
Verificare l'operazione e correggere dove " +"necessario." + +#: ../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 "" +"Una relazione di appartenenza è stata copiata su tutte le nuove " +"strade
Verificare l'operazione e correggere dove necessario." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Dividi il percorso {0} in {1} parti" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Chiude il changeset corrente" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Chiude il changeset corrente ..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Attualmente non ci sono changeset aperti." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "Nessun changeset aperto" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Changeset in chiusura" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Visualizza/nascondi le linee GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Disegna le linee tra i punti GPS grezzi." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Attiva o disattiva l''impostazione globale ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Separa percorsi" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplica i nodi usati da più percorsi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Questo nodo non è attaccato ad altri elementi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Nessuno di questi nodi è attaccato ad altri elementi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "La selezione corrente non può essere utilizzata per la separazione." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Selezionare uno di questi:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Un nodo etichettato, oppure" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Un nodo che è usato da più di un percorso, oppure" + +#: ../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 "" +"* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" + +#: ../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 "" +"* Un percorso che ha uno o più nodi che sono usati da più di un percorso, " +"oppure" + +#: ../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 "" +"* Un percorso ed uno o più dei suoi nodi che sono usati da più di un " +"percorso." + +#: ../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 "" +"Nota: Se un percorso è selezionato, questo percorso avrà delle copie dei " +"nodi separati\n" +"e questi nuovi nodi saranno selezionati. In caso contrario, tutti i percorsi " +"avranno la propria copia\n" +"e tutti i nodi saranno selezionati." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nodo staccato" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplica in {0} nodi" + +#. 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 "Duplica {0} nodi in {1} nodi" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Annulla" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Annulla l'ultima azione." + +#: ../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 "Deseleziona tutto" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Toglie la selezione da tutti gli oggetti." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Deseleziona tutto (al centro)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Deseleziona tutto (al di fuori)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Aggiorna dati" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Aggiorna i dati correnti del livello prelevandoli dal server (ri-scarica i " +"dati)" + +#. 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 "Aggiornamento dei dati" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Non è stato trovato nessun dataset corrente" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Non è stata trovata nessuna primitiva con id {0} nel dataset currente" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Aggiorna la selezione" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Aggiorna le primitive attualmente selezionate dal server" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Selezione vuota" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Carica su OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Carica tutti i cambiamenti sul server OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Ci sono conflitti non risolti sul layer ''{0}''.
Prima devi " +"risolverli." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Niente da caricare. Prima è necessario ottenere dei dati." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Nessun cambiamento da caricare." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Sincronizza solamente {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 "Sincronizza l'intero dataset" + +#: ../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 "" +"Caricamento fallito perché il server possiede una " +"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni.
Il " +"conflitto è stato causato da {0} con identificativo " +"{1},
il server possiede la versione {2}, la tua versione è {3}." +"

Cliccare {4} per sincronizzare solamente la " +"primitiva che causa il conflitto.
Cliccare {5} per " +"sincronizzare tutto l''insieme di dati locale con il server.
Cliccare " +"{6} per annullare e continuare ad apportare delle modifiche." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Rilevato un conflitto" + +#. 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 "Valore di ritorno inatteso. Ottenuto {0}" + +#: ../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 "" +"Caricamento fallito perché il server possiede una " +"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni." +"

Cliccare {0} per sincronizzare tutto l''insieme di " +"dati locale con il server.
Cliccare {1} per annullare e " +"continuare ad apportare delle modifiche.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Attenzione: l'intestazione dell' errore {0} non coincideva con il pattern " +"atteso \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" +"L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Upload fallito.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Invio alle API di OSM fallito" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Aggiornamento della primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Sto caricando dati per layer \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Ingrandisci" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Riduci" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Indietro" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Torna indietro" + +#: ../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 "Più veloce" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Avanti più veloce" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Avanti" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Salta Avanti" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Contrassegno successivo" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Esegui il contrassegno successivo" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Esegui/Pausa" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Esegui/Metti in pausa l'audio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Contrassegno precedente" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Esegui contrassegno precedente" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Più lento" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Avanzamento lento" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Scaricamento dei dati GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Scarica dati GPX" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Dati GPS grezzi" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Scaricamento dei dati" + +#: ../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 "Nessun dato importato." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Dati OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Scaricamento di {0} su {1} ({2} rimanenti)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Errori durante lo scaricamento" + +#: ../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 "Primitive eliminate o spostate" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Modalità Cancella" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Cancella nodi o percorsi." + +#: ../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 "Modalità: {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 "" +"Clicca per cancellare. Shift: cancella un segmento del percorso. Alt: non " +"cancellare i nodi inutilizzati quando elimini un percorso. Ctrl: cancella " +"gli oggetti che si riferiscono a questo." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2270,18 +2127,18 @@ "quel punto." -#: ../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 "Seleziona" -#: ../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 "Seleziona, muovi e ruota gli oggetti." -#: ../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" @@ -2290,18 +2147,18 @@ msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Muovi elementi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Muoverli" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Annullare lo spostamento" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2309,9 +2166,6 @@ "Really move them?" msgstr "" -"Si sono mossi più di {0} elementi. Muovere un grande numero di elementi è " -"spesso dovuto ad un errore.\n" -"Si è sicuri di volerli muovere?" - -#: ../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 "" @@ -2440,7 +2294,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - oggetto con un dato ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2499,41 +2352,41 @@ msgstr "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../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 "Nessuna corrispondenza trovata per ''{0}''" -#: ../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 "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../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 "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../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 "Trovate {0} corrispondenze" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2547,5 +2400,5 @@ "{2}" -#: ../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 "" @@ -2553,10 +2406,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../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" @@ -2565,26 +2418,26 @@ "relazione" -#: ../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 "Token inaspettato: {0}" -#: ../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 "Argomenti mancanti per l'operatore booleano OR." -#: ../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 "Argomento mancante per l'operatore booleano NOT." -#: ../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 "Era attesa una parentesi chiusa." -#: ../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 "Numero errato di parametri per operatore sui nodi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2595,5 +2448,5 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../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." @@ -2630,62 +2483,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Aggiungi nodo" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Aggiungere {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relazioni: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Cambiare {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Cambiare {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Cambia relazione" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Rimuovi \"{0}\" per {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Rimuovi \"{0}\" per {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Rimuovi \"{0}\" per {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Imposta {0}={1} per {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Imposta {0}={1} per {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Imposta {0}={1} per {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2757,30 +2610,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] "Cancella {0} {1}" -msgstr[1] "Cancella {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] "Modalità Cancella" -msgstr[1] "Modalità Cancella" +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] "Cancella {0} {1}" -msgstr[1] "Cancella {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] "Elimina dalla relazione" -msgstr[1] "Elimina dalla relazione" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2794,20 +2647,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n" -"Cancellare dalla relazione?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"La selezione \"{0}\" è usata dalla relazione \"{1}\".\n" -"Cancellare dalla relazione?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2818,5 +2667,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." @@ -2897,17 +2746,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2917,17 +2766,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Risolvi i conflitti di versione per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Risolvi i conflitti di versione per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Risolvi i conflitti di versione per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3066,11 +2915,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"Il file delle preferenze contiene degli errori. Copia di backup del vecchio " -"file su {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3137,5 +2984,5 @@ msgstr "E" -#: ../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 @@ -3143,23 +2990,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 "è richiesto il parametro {0} > 0. Ottenuto {1}." -#: ../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 "il parametro ''{0}'' non deve essere nullo" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Errore: {0}" -#: ../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 "Attenzione: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "indice di colonna non atteso. Ottenuto {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Token inaspettato: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Token inaspettato: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 #, java-format @@ -3172,11 +3044,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 "" @@ -3227,9 +3104,9 @@ msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" -#: ../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 "Il percorso dello stile dell''area non è chiuso." -#: ../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." @@ -3238,118 +3115,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 "Membro vuoto nella relazione." -#: ../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 "Eliminato il membro ''{0}'' nella relazione." -#: ../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 "Percorso ''{0}'' con meno di due punti." -#: ../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 "E' stato trovato più di un percorso \"from\"." -#: ../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 "E' stato trovato più di un percorso \"to\"." -#: ../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 "E' stata trovata più di una \"via\"." -#: ../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 "Ruolo ''{0}'' sconosciuto." -#: ../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 "Tipo di membro sconosciuto per ''{0}''." -#: ../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 "Non è stato trovato un percorso \"from\"." -#: ../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 "Non è stato trovato un percorso \"to\"." -#: ../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 "Non è stato trovato alcun nodo o percorso \"via\"." -#: ../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 "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"." -#: ../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 "Il percorso \"to\" non inizia o finisce su un nodo \"via\"." -#: ../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 "Il percorso \"from\" non inizia o finisce sul percorso \"via\"." -#: ../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 "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." -#: ../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 "Non è stato trovato lo stile per la restrizione {0}." -#: ../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 "Regola ''{0}'' non utile per il percorso ''{1}''." -#: ../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 "Non-percorso ''{0}'' nel multi-poligono." -#: ../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 "Nessun percorso esterno per il multi-poligono ''{0}''." -#: ../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 "Intersezione tra i percorsi ''{0}'' e ''{1}''." -#: ../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 "Il percorso interno ''{0}'' è esterno." -#: ../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 "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." -#: ../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 "Lo stile per il percorso esterno ''{0}'' è discordante." -#: ../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 "senza etichetta" -#: ../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 "testo" @@ -3372,5 +3249,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" @@ -3381,5 +3258,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" @@ -3390,5 +3267,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" @@ -3471,7 +3348,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Impossibile leggere il file ''{0}''. L''errore è:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3502,5 +3379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "ferrovia" @@ -3532,136 +3409,34 @@ msgstr[1] "{0} membri" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " -"{0}.\n" -"Controllare l''indirizzo URL del server nelle proprie preferenze e la " -"propria connessione ad internet." - -#. 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 "sconosciuto" - -#: ../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 "" -"Upload failed verso il server poiché il dataset " -"usato
viola una precondizione.
Il messaggio di errore é:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Violazione della precondizione" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Eccezione di rete" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" msgstr "Eccezione di IO" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Modifica racquet" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Host sconosciuto" -#: ../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 "" -"Upload fallito poiché una delle primitive che hai " -"cercato di cancellare
dal server era già stata eliminata.

Il " -"messaggio di errore è:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitiva già eliminata" @@ -3883,5 +3658,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}" @@ -4281,4 +4056,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 @@ -4354,8 +4131,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 @@ -4487,5 +4264,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 "cancellato" @@ -4545,10 +4322,10 @@ #: ../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 "No, annulla" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4556,7 +4333,4 @@ "yo agree?" msgstr "" -"Per mantenere la propria versione locale, JOSM
deve reimpostare " -"l''identificativo di {0} {1} a 0.
Al prossimo caricamento il server " -"assegnerà ad esso
un nuovo identificativo.
Si è d'accordo?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4590,4 +4364,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 @@ -4601,5 +4376,5 @@ msgstr "Primitiva" -#: ../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 "" @@ -4711,4 +4486,40 @@ msgstr "Il loro insieme di dati non include una etichetta con la chiave {0}" +#: ../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 "Non c'è alcun conflitto di etichette in attesa di risoluzione" + +#: ../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 "Applica" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4721,24 +4532,23 @@ msgstr "tutti" -#: ../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 "Scegli un colore" - -#: ../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}''" @@ -4746,12 +4556,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "il parametro ''{0}'' non deve essere nullo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4759,15 +4569,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "non eliminato" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Non ancora implementato." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4776,17 +4586,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "dal percorso" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Elimina dalla relazione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Conflitto nei dati" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4810,24 +4617,8 @@ msgstr[1] "{0} relazioni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Risoluzione conflitto" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Risolvi conflitti" - -#: ../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 "Applica" - #: ../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 "Incolla" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4842,9 +4633,76 @@ #: ../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} percorso" -msgstr[1] "{0} percorsi" +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 "" +"Cancella il membro dalla riga della tabella utilizzata da questa relazione" + +#: ../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 "luogo" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Irrisolto" + +#. --- 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 "Ruolo:" + +#: ../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 "Chiave:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Valore" + +#: ../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 "Senso unico" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4872,5 +4730,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}" @@ -4903,5 +4761,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." @@ -4974,13 +4832,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 "Livello: {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 "Relazioni: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5066,5 +4924,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 "" @@ -5123,5 +4981,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 "Aggiungi" @@ -5171,5 +5029,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 "Relazioni" @@ -5266,9 +5124,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] "Autore" -msgstr[1] "Autore" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5277,20 +5135,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Visualizza" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Ulteriori informazioni su questa caratteristica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} " -"delle {1} primitive selezionate" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5365,5 +5219,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}" @@ -5382,9 +5236,4 @@ msgid "Child Relations" msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Ruolo:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5634,11 +5483,11 @@ msgstr "Collegato" -#: ../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 "Scarica le relazioni collegate" -#: ../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 "" @@ -5652,7 +5501,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Carica relazione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5779,5 +5627,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Luoghi" @@ -5855,9 +5703,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: Rotella del mouse o doppio click. Spostamento della mappa: muovere il " +"mouse tenendo premuto il tasto destro. Selezionare: click." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5887,17 +5738,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Storico per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Storico per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Storico per {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5906,7 +5757,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Visualizza lo storico della primitiva selezionata" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5941,22 +5791,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Caricamento dello storico per {0} con id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Caricamento dello storico per {0} con id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Caricamento dello storico per {0} con id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6791,78 +6641,74 @@ #: 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 "Nome" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Versione {0} creata il {1} da " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "gruppo di modifiche" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Ulteriori informazioni su questa caratteristica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Ultima modifica {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6880,7 +6726,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nome Strada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6921,12 +6766,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Seleziona un valore" +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 "il parametro ''{0}'' non deve essere nullo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6971,6 +6815,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Correggi i conflitti di etichette" +msgid "Unsaved data and conflicts" +msgstr "Risolvi conflitti" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6987,5 +6831,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 "" @@ -7004,5 +6848,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -7016,7 +6860,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Annulla ed Esci" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7029,7 +6872,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Salva ed Esci" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7107,7 +6949,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Al caricamento" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7116,17 +6957,153 @@ #: ../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 "Usare un nuovo changset a chiuderlo." + +#: ../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 "" +"Selezionare per caricare i dati usando un nuovo changeset e per chiudere il " +"changeset dopo il caricamento" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "Usare un nuovo changset e lasciarlo aperto" + +#: ../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 "" +"Selezionare per caricare i dati usando un nuovo changeset e per chiudere il " +"changeset dopo il caricamento" + +#: ../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 "carica tutte le modifiche in una sola richiesta" + +#: ../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 "" +"Abilitare per caricare tutte le modifiche in una sola richiesta, " +"disabilitare per utilizzare una richiesta per ogni singola primitiva " +"modificata" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Crea un breve commento ai cambiamenti che sta caricando:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Oggetti da aggiungere:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Oggetti da modificare:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Oggetti da eliminare:" + +#: ../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 "Carica le modifiche" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "File" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Caricare questi cambiamenti?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Invio in corso" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Inserisci il nome della località." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Annulla gli aggiornamenti e chiudi la finestra" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7359,5 +7336,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." @@ -7415,7 +7391,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Scaricamento dei dati" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7483,4 +7458,13 @@ msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" + +#: ../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 "" +"Il caricamento di dati GPS non elaborati come dati di mappa è " +"considerato dannoso.
Se si desidera caricare delle tracce, vedere qui:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7673,5 +7657,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 "Scegli la riga da cancellare." @@ -8169,7 +8153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Mostra l'ID dell'oggetto nelle liste di selezione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8184,7 +8167,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Mostra l'ID dell'oggetto nelle liste di selezione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8569,8 +8551,4 @@ msgstr "Disabilita" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Chiave:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8627,5 +8605,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 @@ -8636,42 +8614,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Aggiungi un nuovo livello" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Cancella il livello selezionato." - -#: ../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 "Ulteriori informazioni su questa caratteristica" #. 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 "Attributi opzionali:" -#: ../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 "Usa la preimpostazione \"{0}\" del gruppo \"{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 "Usa la preimpostazione ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "percorso chiuso" -#: ../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 "Tipo sconosciuto: {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 @@ -8682,15 +8658,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {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 "Impossibile leggere {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 "Sono supportati elementi di tipo {0}." -#: ../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 @@ -8700,18 +8676,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../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 "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -8738,5 +8714,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, è possibile che manchino delle etichette." @@ -8752,7 +8727,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 @@ -8830,5 +8802,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}" @@ -8836,5 +8808,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" @@ -8842,5 +8814,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" @@ -8862,6 +8833,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 @@ -8871,20 +8842,20 @@ msgstr "Scaricamento dei dati OSM in corso..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Modifica la relazione #{0} nel layer ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8892,20 +8863,20 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8973,10 +8944,10 @@ "protocollo" -#: ../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 "" @@ -8984,11 +8955,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 "Apertura del gruppo di modifiche..." - -#: ../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}" @@ -8996,34 +8965,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 "Apertura del gruppo di modifiche..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Apertura del gruppo di modifiche..." - -#: ../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 "Apertura del gruppo di modifiche..." - -#: ../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 " @@ -9031,45 +8984,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../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 "Chiusura del gruppo di modifiche..." - -#: ../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 "Apertura del gruppo di modifiche..." - -#: ../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 "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Invio in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../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 "OK - nuovo tentativo." -#: ../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}." @@ -9088,10 +9041,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 "File compressi bzip2 del server OSM" -#: ../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 "File bz2 non valido." @@ -9154,6 +9107,11 @@ "all'interno dell'URL.
Non usare una password di valore." +#: ../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 "Server dei File di OSM" @@ -9182,5 +9140,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 "File compressi gzip del server OSM" @@ -9249,79 +9207,151 @@ msgstr "Errore nella scansione." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Versione sconosciuta" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "I dati OSM sono privi del numero di versione" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "attributo obbligatorio ''{0}'' mancante" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "attributo obbligatorio ''{0}'' mancante" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Versione sconosciuta: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "attributo obbligatorio ''{0}'' mancante" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Trovato elemento in non-percorso." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " ha zero ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Trovato etichetta su una non relazione." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" msgstr "" "Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, " "ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" +msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" +"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, " +"ottenuto {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Manca l''attributo \"type\" sul membro {0} della relazione {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "" -"\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}." - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, " +"ottenuto {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr " incompleto, specificazione con 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Oggetto illegale con 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Valore non permesso per l''attributo \"version\" sulla primitiva OSM con id " "{0}, ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Versione sconosciuta: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Missing attribute \"version\" on OSM primitive with id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Attributo richiesto mancante \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto " +"''{1}''" + +#: ../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 "" @@ -9330,16 +9360,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 "Preparazione dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Id del nodo malformato" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Preparazione dati OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Preparazione dei dati in corso..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9386,33 +9430,43 @@ "internet." -#: ../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} rimanenti. Caricamento di {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} rimanenti. Caricamento di {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} rimanenti. Caricamento di {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 "Invio in corso..." + +#: ../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 "Niente da caricare. Prima è necessario ottenere dei dati." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9451,12 +9505,7 @@ msgstr "Scaricamento estensione {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Salta il download" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9468,4 +9517,9 @@ msgstr "Salta scaricamento" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9512,20 +9566,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 "Disabilita estensione" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Mantieni estensione" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Mantieni estensione" - -#: ../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 " @@ -9535,5 +9589,9 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../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 "" @@ -9543,10 +9601,10 @@ "dall'estensione ''{0}''." -#: ../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 "Secondo le informazioni all'interno del plugin l'autore è {0}." -#: ../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." @@ -9555,9 +9613,9 @@ "comunicare un bug." -#: ../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 "Disabilitare l'estensione?" -#: ../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 " @@ -9567,14 +9625,14 @@ "eliminare l'estensione." -#: ../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 "" "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Informazioni sull''estensione" -#: ../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" @@ -9630,4 +9688,35 @@ "\n" "{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 "sconosciuto" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9705,4 +9794,97 @@ msgstr "(Il testo è stato già copiato nei tuoi appunti)" +#: ../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 "" +"Upload failed verso il server poiché il dataset " +"usato
viola una precondizione.
Il messaggio di errore é:
{0}" + +#: ../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 +#, fuzzy +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 "" +"La dimensione massima del bbox è 0.25, e la tua richiesta risulta troppo " +"ampia. Effettuare una richiesta di minori dimensioni oppure usare il file " +"planet.osm" + +#: ../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 "" +"Upload fallito poiché una delle primitive che hai " +"cercato di cancellare
dal server era già stata eliminata.

Il " +"messaggio di errore è:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9779,5 +9961,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9786,5 +9968,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9793,5 +9975,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9800,5 +9982,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9807,5 +9989,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9866,40 +10048,39 @@ msgstr "Carica tracciati" -#: ../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 "Descrizione" -#: ../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 "Inserire la descrizione sul proprio tracciato." -#: ../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 "Inserire le etichette sul proprio tracciato." -#: ../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}" @@ -9907,47 +10088,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 "Connessione in corso..." -#: ../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 "Caricamento annullato" -#: ../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 "Errore durante il caricamento" -#: ../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 "Caricamento GPX completato con successo" -#: ../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 "Caricamento fallito. Il server ha risposto con il seguente messaggio: " -#: ../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 "Caricamento tracciato GPX in corso: {0}% ({1} di {2})" -#: ../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 "Non è stata fornita alcuna descrizione. Specificarne una." -#: ../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 "Nessun livello GPX selezionato. Impossibile caricare un tracciato." -#: ../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 "Non è stato fornito alcun nome utente." -#: ../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 "Non è stata fornita alcuna password." -#: ../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 "Caricamento del tracciato GPX in corso" @@ -10166,5 +10347,5 @@ msgstr "Immagini ancora senza etichetta" -#: ../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 "Correla le immagini al tracciato GPX" @@ -10178,13 +10359,13 @@ msgstr "Auto-determina" -#: ../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 "Selezionare un tracciato GPX" -#: ../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 "Nessun tracciato GPX selezionato" -#: ../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 "" @@ -10195,9 +10376,9 @@ "Formato atteso: {0}" -#: ../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 "Fuso orario non valido" -#: ../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 "" @@ -10208,26 +10389,26 @@ "Formato atteso: {0}." -#: ../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 "Compensazione non valida" -#: ../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 "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" -#: ../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 "Tracciato GPS caricato" -#: ../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 "Le foto selezionate non contengono informazioni sull'ora." -#: ../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 "Le foto non contengono informazioni sull'ora" -#: ../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." @@ -10236,39 +10417,39 @@ "Selezionarne un altro." -#: ../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 "Il tracciato GPX non contiene alcuna informazione sull'ora" -#: ../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 "Fuso orario: {0}" -#: ../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 "Minuti: {0}" -#: ../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 "Secondi: {0}" -#: ../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 "Correlate {0} su {1} foto al tracciato GPX." -#: ../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 "(Differenza di orario pari a {0} giorni)" -#: ../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 "Differenza tra il tracciato e le foto: {0}m {1}s" -#: ../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 " @@ -10279,13 +10460,13 @@ "manualmente le foto." -#: ../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 "E' fallita la correlazione delle foto al tracciato" -#: ../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 "Regola fuso orario e differenza" -#: ../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 "Valori predefiniti" @@ -10323,5 +10504,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 "Errore durante il caricamento del file" @@ -10350,11 +10531,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"La località {0} non è stata trovata nel WMS.\n" -"Verificane la presenza su www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10370,13 +10549,13 @@ msgstr "Scegliere da..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../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" @@ -10389,13 +10568,13 @@ "Si desidera ripristinare F11 per l'azione di cattura ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Ripristino della scorciatoia F11 di cattura" -#: ../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 "JOSM si è fermato in attesa che il cambiamento abbia effetto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10522,9 +10701,9 @@ "dimensione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Aggiunta l'auto-etichettatura della sorgente:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Aggiungere \"source=...\" agli elementi?" @@ -10634,7 +10813,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "caricamento immagine..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10680,7 +10858,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Seleziona" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10769,5 +10946,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 "Livello vuoto" @@ -11730,18 +11907,18 @@ msgstr "Stato della segnalazione sconosciuto" -#: ../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 "Apri file visibili..." -#: ../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 "Apre solo i file che sono visibili nella visualizzazione corrente." -#: ../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 "Nessuna visualizzazione aperta - impossibile determinare i confini!" -#: ../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}" @@ -11752,5 +11929,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11760,9 +11937,9 @@ "delle impostazioni della mappa nelle preferenze." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "Opzioni osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Eseguibile di Firefox" @@ -11773,16 +11950,21 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Crea un nuovo nodo." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "cambia la selezione" -#: ../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 "cambia la visualizzazione" -#: ../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 "conferma manualmente tutte le azioni di controllo remoto" -#: ../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 "" @@ -11790,13 +11972,13 @@ "applicazioni." -#: ../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 "Controllo remoto" -#: ../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 "Preferenze per l'estensione di controllo remoto." -#: ../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 " @@ -11808,28 +11990,35 @@ "applicazioni esterne che devono dialogare con l'estensione." -#: ../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 "Azioni permesse" -#: ../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 "Il controllo remoto ha richiesto il caricamento dei dati dalle API." -#: ../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 "Dettagli della richiesta: {0}" -#: ../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 "Si vuole permettere questo?" -#: ../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 "Conferma l'azione del controllo remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API." + +#: ../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 "" @@ -12337,25 +12526,33 @@ "favore verifica che non siano stati introdotti errori." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Inserire dei valori per tutti i conflitti." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Risolvi conflitti" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Correggi i conflitti di etichette" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Sono stati rimossi elementi dalle Relazioni" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Unisi Aree: Elimina le way corte" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Strada chiusa (anello)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Rimuovi i tag dalle way interne" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funzione di unione delle Aree" @@ -12433,6 +12630,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 "Errori di verifica" @@ -12442,10 +12639,10 @@ msgstr "Nessun errore individuato" -#: ../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 "Griglia" -#: ../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 "" @@ -12539,51 +12736,66 @@ msgstr "Esegue la convalida dei dati" -#: ../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 "I dati contengono errori. Caricarli ugualmente?" -#: ../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 "Apre la finestra di verifica." -#: ../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 "Porta lo zoom sul problema" -#: ../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 "Correggi" -#: ../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 "Correggi gli errori selezionati." -#: ../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 "Ignora" -#: ../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 "La prossima volta ignora gli errori selezionati" -#: ../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 "Tutto il gruppo" -#: ../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 "Elementi singoli" -#: ../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 "Niente" -#: ../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 "Ignorare tutto il gruppo o i singoli elementi?" -#: ../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 "Ignora elementi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Attesa di 10 secondi ... " + +#: ../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 "Aggiornamento dei dati" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12609,16 +12821,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Questo test controlla se due strade, ferrovie o corsi d'acqua si incrociano " -"sullo stesso livello senza essere connessi a vicenda tramite un nodo." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Crea un edificio" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12626,19 +12834,18 @@ msgstr "Percorsi incrociati" -#: ../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 "Nodi duplicati" -#: ../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 "Questo test verifica che non ci siano due nodi nella stessa posizione." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Nodi con lo stesso nome" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Conferma" @@ -12646,19 +12853,16 @@ #: ../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 "Duplica percorso" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Questo test verifica che non ci siano due nodi nella stessa posizione." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Crea un percorso duplicato" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13256,5 +13460,5 @@ msgstr "E' stato raggiunto un incrocio" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "E' stata generata una eccezione" @@ -13361,5 +13565,5 @@ msgstr "Aggiungi immagine rettificata" -#: ../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 " @@ -13369,5 +13573,5 @@ "l'identificativo al servizio selezionato. Si prega di riprovare." -#: ../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 "Nessun id o indirizzo URL WMS valido" @@ -13385,17 +13589,17 @@ msgstr "Selezionare il livello WMS da regolare." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "Seleziona il livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Inizia la regolazione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "Non c'è al momento alcun livello WMS da regolare." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "Nessun livello da regolare" @@ -13438,9 +13642,8 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Attiva" - -#: ../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}" @@ -13448,10 +13651,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13462,14 +13665,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Data non valida" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13478,102 +13680,113 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Ricarica tile sbagliati" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Apri un livello WMS vuoto per caricare i dati da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Preferenze dell'estensione WMS" -#: ../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 "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" -#: ../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 "Nome del Menu" -#: ../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 "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Nome del menu (predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "URL WMS (Predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Inserire un nome per il menù e un URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Copia predefiniti" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Selezionare almeno un precorso." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Downloader:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Sovrapponi tiles" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% di lat:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% di lat:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "File TCX (*.tcx)" +msgstr "" #. * @@ -13998,5 +14211,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 "Riferimento" @@ -14538,7 +14751,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Casetta (chalet)" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14559,8 +14771,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 "Noleggio" +msgstr "" #. color heath @@ -14578,5 +14789,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 "bosco" @@ -14589,7 +14801,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "Biglietti per il parcheggio" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14625,7 +14836,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "ciottoli (pavé)" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14636,7 +14846,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incompleto" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14647,7 +14856,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "erba" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14841,4 +15049,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" @@ -14867,12 +15076,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 "si" #. color permissive -#. +#. #. 1 #. 40000 @@ -14920,5 +15129,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14955,5 +15164,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -15017,6 +15226,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 "no" @@ -15162,6 +15372,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 "Tipo" @@ -15432,7 +15642,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Pedestrian" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15451,7 +15660,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Spunzoni" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15743,7 +15951,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 "Operatore" @@ -15956,6 +16164,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 "Elevazione" @@ -16867,7 +17075,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" @@ -16915,23 +17120,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 "Orario di apertura" @@ -16955,5 +17160,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" @@ -17000,22 +17204,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 "" @@ -17030,22 +17234,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 "" @@ -17060,22 +17264,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 "" @@ -17109,5 +17313,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 "Numero di riferimento" @@ -17127,7 +17331,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "parcheggio di interscambio" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -17141,7 +17344,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Capacità" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -17151,12 +17353,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Spazi per disabili" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Spazi per disabili" +msgstr "" #: build/trans_presets.java:1400 @@ -17358,5 +17558,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Pensilina/ricovero" @@ -17741,7 +17941,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17784,28 +17983,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "cinese" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Area da scaricare" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Incolla" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Città" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regionale" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17833,7 +18027,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Percorso escursionistico montano" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17847,7 +18040,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "tratto parallelo ad una ferrovia principale" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17864,13 +18056,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Dogana" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "principante" +msgstr "" #: build/trans_presets.java:1737 @@ -17887,31 +18077,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "tipologia di area" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Cartello di indicazioni (escursionismo)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informazioni" +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 "Descrizione più specifica" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "" #. @@ -17922,7 +18107,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Numero di telefono" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18246,5 +18430,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18278,5 +18462,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19402,6 +19586,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 "Religione" @@ -19410,66 +19594,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 "bahaismo" -#: 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 "Buddista" -#: 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 "Cristiana" -#: 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 "induismo" -#: 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 "giainismo" -#: 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 "Ebraica" -#: 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 "Mussulmana" -#: 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 "Spiritualista" -#: 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 "taoismo" -#: 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 "unitariano" -#: 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 "zoroastrismo" -#: 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 "Denominazione" @@ -19478,76 +19662,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 "Anglicana" -#: 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 "Battista" -#: 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 "Cattolica" -#: 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 "Evangelica" -#: 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 "Testimoni di Geova" -#: 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 "Luterana" -#: 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 "Metodista" -#: 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 "Mormone" -#: 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 "Ortodossa" -#: 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 "Pentecostale" -#: 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 "Prebiteriana" -#: 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 "Protestante" -#: 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 "Quacchera" -#: 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 "sciismo" -#: 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 "sunnismo" @@ -19879,5 +20063,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 "Nota" @@ -19902,5 +20086,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 "Monete" @@ -19908,5 +20092,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 "Note" @@ -19914,5 +20098,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 "Portafogli elettronici e carte di debito" @@ -19920,5 +20104,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 "Carte di debito" @@ -19926,5 +20110,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 "Carte di credito" @@ -19983,10 +20167,144 @@ msgstr "Panchina" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Indietro" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Memoriale" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "nessuno" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "luogo" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Colore" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Indietro" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "giù" + +#. 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 "verde" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "fine" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valore" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "acqua" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Numero di linee" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Postazione di caccia" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Modifica una postazione di caccia" @@ -19995,30 +20313,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 "Modifica Albero" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "basso" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "mezzo" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "completo" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Nascondi" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Blocco" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontana" @@ -20027,10 +20345,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Modifica Fontana" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Acqua potabile" @@ -20039,10 +20357,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Modifica acqua potabile" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Culla per la vita" @@ -20050,35 +20368,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Modifica culla per la vita" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Negozi" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermercato" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Modifica Supermercato" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Casetta (chalet)" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Modifica casetta (chalet)" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Minimarket" @@ -20086,9 +20402,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Modifica minimarket" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Chiosco" @@ -20096,29 +20412,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Modificia Chiosco" -#: 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 "Modifica fermata dell'autobus" - -#: 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 "Modifica albero singolo" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Distributore automatico" @@ -20126,5 +20440,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Modifica Distributore automatico" @@ -20132,88 +20446,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Distributore automatico" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "Biglietti trasporto pubblico" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "Orari trasporto pubblico" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "Biglietti per il parcheggio" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "Alimenti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "Bevande" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "Dolci" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "Sigarette" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "Cibo per animali" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "Giornali" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "giocattoli" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "francobolli" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "Schede SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "buoni_telefonici" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "buoni" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "preservativi" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "assorbenti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "Sacchetto per escrementi" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Conto o carta fedeltà" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Macellaio" @@ -20221,9 +20535,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Modifica Macellaio" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Panificio" @@ -20231,9 +20545,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Modifica Panificio" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Fiorista" @@ -20241,18 +20555,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Modifica Fiorista" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Prodotti biologici" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Modifica negozio di prodotti biologici" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alcolici (non in Italia)" @@ -20260,54 +20574,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Modifica negozio di alcolici (non in Italia)" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Bevande" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Modifica negozio di bevande" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Modifica negozio di informatica" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elettronica" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Modifica Negozio di Elettronica" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Modifica negozio di Hi-Fi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Mobilia" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Modifica Negozio di Mobilia" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Giardinaggio" @@ -20315,9 +20629,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Modifica giardinaggio" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Ferramenta" @@ -20325,9 +20639,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Modifica Negozio di Ferramenta" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Fai-da-te" @@ -20335,54 +20649,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Modifica negozio Fai-da-te" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Cartoleria" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Modifica cartoleria" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Parrucchiere/barbiere" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Modifica parrucchiere/barbiere" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Calzature" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Modifica Negozio di Scarpe" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Giocattoli" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Modifica Negozio di Giocattoli" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Videoteca" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Modifica videoteca" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Lavanderia a secco" @@ -20390,9 +20704,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Modifica Lavanderia a secco" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Lavanderia" @@ -20400,9 +20714,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Modifica lavanderia" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Sport all'aperto" @@ -20410,32 +20724,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Modifica sport all'aperto" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Articoli sportivi" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Modifica articoli sportivi" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Ottico" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Modifica Ottico" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Contanti" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banca" @@ -20443,14 +20757,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Modifica banca" -#: 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 "Bancomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Cambiavalute" @@ -20458,5 +20772,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Modifica cambiavalute" @@ -20464,15 +20778,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Modifica bancomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Salute" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Ambulatorio" @@ -20480,18 +20794,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Modifica ambulatorio" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Modifica dentista" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Farmacia" @@ -20499,5 +20813,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Modifica Farmacia" @@ -20505,9 +20819,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Vendita medicinali con obbligo di prescrizione" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Ospedale" @@ -20515,10 +20829,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Modifica Ospedale" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Colonnina SOS" @@ -20527,5 +20841,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Modifica Colonnina SOS" @@ -20534,20 +20848,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Numero del punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Nome del punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Numero di telefono" #. 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 "(Usare prefisso internazionale, es. +12-345-67890)" @@ -20555,5 +20869,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 "Veterinario" @@ -20562,55 +20876,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Modifica veterinario" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Modifica continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Stato" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Modifica stato" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Regione" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Modifica regione" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Provincia" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Modifica provincia" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Contea (in Italia NON usare)" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Modifica contea (in Italia NON usare)" @@ -20618,15 +20932,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Città" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Modifica città" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Paese" @@ -20634,10 +20948,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Modifica Paese" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Sobborgo" @@ -20645,25 +20959,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Modifica Sobborgo" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Frazione" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Modifica Frazione" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Borgo" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Modifica Borgo" @@ -20671,5 +20985,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Luogo che ha un nome, ma non popolato" @@ -20677,10 +20991,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Località" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Isola" @@ -20688,24 +21002,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Modifica isola" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "sinistra" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Modifica casetta (chalet)" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Entrata di una grotta/caverna" @@ -20713,10 +21025,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Modifica entrata di una grotta/caverna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Picco montuoso" @@ -20724,10 +21036,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Modifica picco montuoso" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Ghiacciaio" @@ -20735,10 +21047,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Modifica Ghiacciaio" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulcano" @@ -20746,70 +21058,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Modifica vulcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Confini" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nazionale" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Modifica confine nazionale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Amministrativo" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Modifica confine amministrativo" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Modifica confine civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politico" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Modifica confine politico" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Parco nazionale" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Modifica Confine Parco Nazionale" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Uso del terreno" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Albero" @@ -20818,15 +21130,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Modifica albero singolo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Nome Botanico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Bosco" @@ -20835,5 +21147,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Modifica bosco" @@ -20841,17 +21153,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 "Conifere" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "deciduo (caducifoglie)" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "Mista" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Foresta" @@ -20860,14 +21172,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Modifica area di foresta" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Riserva naturale" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Modifica riserva naturale" @@ -20875,25 +21187,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Ghiaione" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Modifica Ghiaione" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Boscaglia" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Modifica boscaglia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Fell" @@ -20901,10 +21213,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Modifica Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Brughiera" @@ -20912,5 +21224,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Modifica brughiera" @@ -20918,5 +21230,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Aia" @@ -20925,45 +21237,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Modifica aia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Area agricola" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Modifica area agricola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Prato" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Modifica area a prato" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vigna" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Modifica area di vigneto" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20972,25 +21284,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Giardino" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Modifica giardino" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Erba" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Modifica area di prato" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Village Green" @@ -20998,10 +21310,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Modifica Village Green" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Common (UK)" @@ -21009,20 +21321,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Modifica una Common (UK)" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Parco" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Modifica parco" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Area di svago" @@ -21030,5 +21342,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Modifica area di svago" @@ -21036,15 +21348,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Residential Landuse" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Modifica Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Cimitero" @@ -21052,9 +21364,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Modifica Cimitero" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cimitero" @@ -21062,39 +21374,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Modifica area di cimitero (esteso)" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Commerciale (negozi)" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Modifica area commerciale (negozi)" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Commerciale (uffici)" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Modifica area commerciale (uffici)" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industriale" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Modifica area industriale" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Deposito materiale ferroviario" @@ -21102,15 +21414,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Modifica deposito materiale ferroviario" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militare" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Modifica area militare" @@ -21118,55 +21430,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Area in costruzione" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Modifica area in costruzione" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Ridestinazione d'uso" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Modifica area di ridestinazione d'uso" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Area agricola destinata alla costruzione" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Modifica area agricola destinata alla costruzione" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Discarica" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Modifica area di discarica" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Cava" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Modifica area di cava/miniera" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multi-poligono" @@ -21176,5 +21488,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 "Modifica un multi-poligono" @@ -21183,10 +21495,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "segmento esterno" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "segmento interno" @@ -21194,5 +21506,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Divieto di svolta" @@ -21201,5 +21513,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Modifica un divieto di svolta" @@ -21207,34 +21519,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Divieto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "no svolta a sinistra" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "no svolta a destra" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "non diritto" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "no inversione di marcia" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "solo svolta a destra" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "solo svolta a sinistra" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "solo diritto" @@ -21243,15 +21555,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "dal percorso" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "attraverso il nodo o percorso" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "verso il percorso" @@ -21259,5 +21571,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Percorso" @@ -21266,5 +21578,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Modifica un percorso" @@ -21272,5 +21584,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Tipo di percorso" @@ -21278,5 +21590,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21342,5 +21654,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 @@ -21349,17 +21661,17 @@ msgstr "bicicletta" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "strada" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "traghetto" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "sci" @@ -21412,5 +21724,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 @@ -21419,13 +21731,13 @@ msgstr "pedone" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "escursionismo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "deviazione" @@ -21439,10 +21751,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metropolitana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Descrizione del simbolo" @@ -21450,31 +21762,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Rete" #. 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 "proposto" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporaneo" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "collegamento" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Colore (esadecimale)" @@ -21483,30 +21795,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "segmento di percorso" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "segmento diretto" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "segmento opposto" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "punto di fermata" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "punto di fermata diretto" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "punto di fermata opposto" @@ -24659,76 +24971,4 @@ msgstr "attrazione storica" -#. 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 "verde" - #. color green #. @@ -25696,4 +25936,166 @@ msgstr "Terraserver Urban" +#. 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 "Tutti i percorsi erano vuoti" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Unire i nodi con diffenti appartenenze?" + +#~ msgid "Merge Anyway" +#~ msgstr "Incorpora comunque" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque " +#~ "unirli?" + +#~ msgid "Unknown version" +#~ msgstr "Versione sconosciuta" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "I dati OSM sono privi del numero di versione" + +#~ msgid "Found element in non-way." +#~ msgstr "Trovato elemento in non-percorso." + +#~ msgid " has zero ref" +#~ msgstr " ha zero ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Trovato etichetta su una non relazione." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "" +#~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}." + +#~ msgid "Ill-formed node id" +#~ msgstr "Id del nodo malformato" + +#~ msgid "Data Layer" +#~ msgstr "Livello dati" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Move" +#~ msgstr "Sposta" + +#~ msgid "unnamed" +#~ msgstr "Senza nome" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare." + +#~ msgid "Unknown file extension." +#~ msgstr "L'estensione del file è sconosciuta." + +#~ msgid "Change" +#~ msgstr "Cambia" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Risolvere {0} conflitti in {1} oggetti" + +#~ msgid "Rotate" +#~ msgstr "Ruota" + +#~ msgid "different" +#~ msgstr "diverso" + +#~ msgid "true" +#~ msgstr "vero" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "position" +#~ msgstr "posizione" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} oggetto causa conflitti:" +#~ msgstr[1] "{0} oggetti causano conflitti:" + +#~ msgid "my version:" +#~ msgstr "versione locale:" + +#~ msgid "their version:" +#~ msgstr "versione remota:" + +#~ msgid "resolved version:" +#~ msgstr "versione risolta:" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolvi conflitti" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Fare clic su Ricarica per aggiornare la lista" + +#~ msgid "Object" +#~ msgstr "Oggetto" + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla " +#~ "versione selezionata nella lista della cronologia." + +#~ msgid "Occupied By" +#~ msgstr "Occupato da" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri" + +#~ msgid "There were conflicts during import." +#~ msgstr "Si sono verificati dei conflitti durante l'importazione." + +#~ msgid "Error parsing server response." +#~ msgstr "Errore di scansione nella risposta del server." + +#~ msgid "Cannot connect to server." +#~ msgstr "Impossibile connettersi al server." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse " +#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Connessione al server OSM..." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nome utente (email) per l'account di OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Username OSM (email)" + +#~ msgid "Aborting..." +#~ msgstr "Interruzione in corso" + +#~ msgid "Commit comment" +#~ msgstr "Inserisci commento" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" @@ -25701,7 +26103,9 @@ #~ "sul server." -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" + +#~ msgid "Navigation" +#~ msgstr "Navigazione" #~ msgid "" @@ -25712,209 +26116,6 @@ #~ "questo come bug." -#~ msgid "No document open so nothing to save." -#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare." - #~ msgid "Delete {1} {0}" #~ msgstr "Cancella {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Rimuovere il membro della relazione {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Impossibile aprire la cartella delle preferenze: {0}" - -#~ msgid "nodes" -#~ msgstr "nodi" - -#~ msgid "ways" -#~ msgstr "vie" - -#~ msgid "relations" -#~ msgstr "relazioni" - -#~ msgid "changesets" -#~ msgstr "gruppi di modifiche" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "E'' fallito il caricamento dello storico dal server. Dettagli:
" -#~ "{0}" - -#~ msgid "Delete Layer" -#~ msgstr "Elimina livello" - -#~ msgid "Delete all" -#~ msgstr "Elimina tutto" - -#~ msgid "Authors: {0}" -#~ msgstr "Autori: {0}" - -#~ msgid "Public" -#~ msgstr "Pubblico" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org" - -#~ msgid "Set Lambert coordinate" -#~ msgstr "Imposta le coordinate di Lambert" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di " -#~ "caricarlo." - -#~ msgid "Continue anyway" -#~ msgstr "Continua comunque" - -#~ msgid "Copy Default" -#~ msgstr "Copia predefinito" - -#~ msgid "Edit Information Office" -#~ msgstr "Modifica ufficio informazioni" - -#~ msgid "Map Type" -#~ msgstr "Tipo di mappa" - -#~ msgid "map" -#~ msgstr "mappa" - -#~ msgid "citymap" -#~ msgstr "mappa cittadina" - -#~ msgid "hikingmap" -#~ msgstr "mappa escursionistica" - -#~ msgid "bicyclemap" -#~ msgstr "mappa ciclistica" - -#~ msgid "Board Type" -#~ msgstr "Tipo di tabellone" - -#~ msgid "board" -#~ msgstr "tavola" - -#~ msgid "Data Layer" -#~ msgstr "Livello dati" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Move" -#~ msgstr "Sposta" - -#~ msgid "unnamed" -#~ msgstr "Senza nome" - -#~ msgid "Unknown file extension." -#~ msgstr "L'estensione del file è sconosciuta." - -#~ msgid "Change" -#~ msgstr "Cambia" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Risolvere {0} conflitti in {1} oggetti" - -#~ msgid "Rotate" -#~ msgstr "Ruota" - -#~ msgid "different" -#~ msgstr "diverso" - -#~ msgid "true" -#~ msgstr "vero" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "position" -#~ msgstr "posizione" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} oggetto causa conflitti:" -#~ msgstr[1] "{0} oggetti causano conflitti:" - -#~ msgid "my version:" -#~ msgstr "versione locale:" - -#~ msgid "their version:" -#~ msgstr "versione remota:" - -#~ msgid "resolved version:" -#~ msgstr "versione risolta:" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolvi conflitti" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Fare clic su Ricarica per aggiornare la lista" - -#~ msgid "Object" -#~ msgstr "Oggetto" - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla " -#~ "versione selezionata nella lista della cronologia." - -#~ msgid "Occupied By" -#~ msgstr "Occupato da" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "" -#~ "Cancella il membro dalla riga della tabella utilizzata da questa relazione" - -#~ msgid "There were conflicts during import." -#~ msgstr "Si sono verificati dei conflitti durante l'importazione." - -#~ msgid "Error parsing server response." -#~ msgstr "Errore di scansione nella risposta del server." - -#~ msgid "Cannot connect to server." -#~ msgstr "Impossibile connettersi al server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse " -#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Connessione al server OSM..." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nome utente (email) per l'account di OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Username OSM (email)" - -#~ msgid "Aborting..." -#~ msgstr "Interruzione in corso" - -#~ msgid "Commit comment" -#~ msgstr "Inserisci commento" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigazione" - -#~ msgid "end" -#~ msgstr "fine" #~ msgid "Revert" @@ -25952,11 +26153,4 @@ #~ msgstr "Costo" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: Rotella del mouse o doppio click. Spostamento della mappa: muovere " -#~ "il mouse tenendo premuto il tasto destro. Selezionare: click." - #~ msgid "Validate" #~ msgstr "Convalida" @@ -25996,4 +26190,19 @@ #~ msgid "Plugin already exists" #~ msgstr "Estensione già esistente" + +#~ msgid "Copy Default" +#~ msgstr "Copia predefinito" + +#~ msgid "citymap" +#~ msgstr "mappa cittadina" + +#~ msgid "hikingmap" +#~ msgstr "mappa escursionistica" + +#~ msgid "map" +#~ msgstr "mappa" + +#~ msgid "bicyclemap" +#~ msgstr "mappa ciclistica" #~ msgid "YAHOO (WebKit GTK)" @@ -26110,6 +26319,19 @@ #~ "Non caricarire nessun dato dopo questo messaggio." +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Impossibile aprire la cartella delle preferenze: {0}" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." + #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Geofabrik.de dell'Alto Palatinato" + +#~ msgid "board" +#~ msgstr "tavola" + +#~ msgid "Authors: {0}" +#~ msgstr "Autori: {0}" #~ msgid "Layers: {0}" @@ -26130,4 +26352,11 @@ #~ "E'' stato ignorato un percorso perché include un nodo che non esiste: " #~ "{0}\n" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Pubblico" #~ msgid "" @@ -26151,9 +26380,20 @@ #~ msgstr[1] "{0} Estensioni aggiornate con successo. Riavviare JOSM." +#~ msgid "Delete Layer" +#~ msgstr "Elimina livello" + #~ msgid "Delete and Download" #~ msgstr "Elimina e Scarica" +#~ msgid "Continue anyway" +#~ msgstr "Continua comunque" + #~ msgid "No intersections found. Nothing was changed." #~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato." + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di " +#~ "caricarlo." #~ msgid "Relation Editor: {0}" @@ -26209,4 +26449,13 @@ #~ msgstr "" #~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:" + +#~ msgid "Edit Information Office" +#~ msgstr "Modifica ufficio informazioni" + +#~ msgid "Map Type" +#~ msgstr "Tipo di mappa" + +#~ msgid "Board Type" +#~ msgstr "Tipo di tabellone" #~ msgid "sports" @@ -26279,10 +26528,4 @@ #~ msgstr "collegato" -#~ msgid "Overlap tiles" -#~ msgstr "Sovrapponi tiles" - -#~ msgid "% of lat:" -#~ msgstr "% di lat:" - #~ msgid "% of lon:" #~ msgstr "% di lon:" @@ -26325,4 +26568,13 @@ #~ msgstr "Selezione troppo grande" +#~ msgid "nodes" +#~ msgstr "nodi" + +#~ msgid "relations" +#~ msgstr "relazioni" + +#~ msgid "ways" +#~ msgstr "vie" + #~ msgid "Error when communicating with server." #~ msgstr "Errore durante la comunicazione con il server." @@ -26334,4 +26586,7 @@ #~ msgstr "Primitiva mancante" +#~ msgid "changesets" +#~ msgstr "gruppi di modifiche" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi." @@ -26340,4 +26595,9 @@ #~ msgstr "Il livello {0} deve essere presente nella lista dei livelli" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "E'' fallito il caricamento dello storico dal server. Dettagli:
" +#~ "{0}" + #~ msgid "Sort" #~ msgstr "Ordina" @@ -26351,4 +26611,7 @@ #~ msgid "No data" #~ msgstr "Nessun dato" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Rimuovere il membro della relazione {0} {1}" #~ msgid "" @@ -26365,2 +26628,8 @@ #~ msgstr "" #~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}" + +#~ msgid "Delete all" +#~ msgstr "Elimina tutto" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Imposta le coordinate di Lambert" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 17594) +++ /applications/editors/josm/i18n/po/ja.po (revision 17595) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-06 04:01+0000\n" -"Last-Translator: Hiroshi Miura \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-11 15:08+0000\n" +"Last-Translator: higa4 \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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 "ヘルプ" -#: ../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 "投影法 {0} は、使用可能できませんでした。メルカトル図法を使います。" -#: ../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,53 +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 "エラー" -#: ../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] "保存されていない変更があります。変更分を破棄して継続しますか？" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "保存されていない変更" -#: ../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 "保存して終了" -#: ../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 "変更を破棄して終了" -#: ../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 @@ -156,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 @@ -174,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 "キャンセル" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{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 @@ -204,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 @@ -243,15 +244,18 @@ msgstr "警告" -#: ../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 "不正な形式のファイルURL\"{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}" msgstr "" +"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -338,5 +342,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 "プラグイン" @@ -356,4 +360,7 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" +"警告: API のベースURLのフォーマットがおかしいです。OSM プリミティブの情報や履" +"歴のページにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}" +"\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 @@ -363,4 +370,6 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" +"警告: API のベースURLのフォーマットがおかしいです。OSM ユーザーのページにリダ" +"イレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -471,9 +480,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 @@ -507,6 +516,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 @@ -525,11 +534,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 "情報" @@ -551,5 +560,5 @@ msgstr "少なくとも3つのノードを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -559,10 +568,10 @@ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {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機能違反" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -571,5 +580,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -580,9 +589,9 @@ "です。値の長さは{3}です。" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -638,26 +647,22 @@ msgstr "ズームの対象になる競合はありません" -#: ../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 "ウエイの結合" -#: ../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 "複数のウエイを一つに結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "結合する少なくとも二つのウエイを選択してください。" - -#: ../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 "異なるメンバーであるウェイを結合しますか？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "強制的に連結。" -#: ../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 " @@ -667,13 +672,13 @@ "か？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "方向を変更しますか?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "逆転して接続" -#: ../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 " @@ -681,31 +686,19 @@ msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？" -#: ../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 "すべての競合に値を入力してください。" - -#: ../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 "競合を解決する" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 +#: ../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 "" +"ウエイを結合できません（これらをノードの一列として統合することができません）" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "ウェイが全て空です。" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"ウエイを結合できません（これらをノードの一列として統合することができません）" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "結合する少なくとも二つのウエイを選択してください。" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -761,5 +754,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 "削除" @@ -769,15 +762,15 @@ msgstr "選択したオブジェクトを削除します" -#: ../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 "上書きする" -#: ../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 "ファイルが存在します。上書きしますか？" @@ -806,10 +799,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}" @@ -840,5 +833,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 @@ -848,10 +841,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" +msgstr "ダウンロード中に競合" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" -msgstr "" +msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 @@ -881,7 +874,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "すべての画像" +msgstr "全てのフォーマット" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -905,5 +897,5 @@ #, java-format msgid "paramenter ''{0}'' must not be null" -msgstr "" +msgstr "パラメータ ''{0}'' はヌルでなければなりません" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -912,8 +904,10 @@ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." msgstr "" +"OSMデータレイヤーかGPXレイヤーのインスタンスであると期待しています。 " +"''{0}''を得ました。" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "GPX ファイルをエクスポート" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 @@ -964,5 +958,5 @@ #, java-format msgid "Help page missing. Create it in english." -msgstr "" +msgstr "ヘルプページがありません。英語で作成してください。" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 @@ -972,4 +966,6 @@ "\">your language." msgstr "" +"ヘルプページがありません。英語 または あ" +"なたの言語で作成してください。" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 @@ -980,14 +976,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "OSM ウェイ、ノードまたはリレーションについて履歴情報を表示" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "要素についての情報" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -1010,1043 +1006,31 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "レイヤーを結合" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +msgstr "現在のレイヤーを他のレイヤーに結合" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 msgid "Merge Nodes" msgstr "ノードの結合" -#: ../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 "一番古いものにノードをマージします。" -#: ../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 "結合する少なくとも二つのウエイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "異なったメンバーになっているノードを結合しますか？" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "強制的に結合" - -#: ../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 "選択したノードは、異なった関連に属しています。それでも、結合しますか？" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"ノードを結合できません：使用しているウェイを削除しないとけなくなります。" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "{0}ノードを結合する" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "鏡像" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "選択したノードやウェイの鏡像を作ります。" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "少なくとも1つはノードかウェイを選んでください。" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "上" - -#: ../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 "オブジェクト{0}を移動" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "下" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "左" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "右" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "移動 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "オブジェクトの移動 {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 "オブジェクトを世界の外に移動できません。" - -#: ../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 "新規" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "新しい地図を作成します。" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "開く..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "ファイルを開く" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "ファイルを開く" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "不明なロール\"{0}\"です。" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "場所を開く..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "URL を開く。" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "レイヤーに分ける" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "ダウンロードするURLの入力:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "ダウンロード先" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "ダウンロードURL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "直交した形状" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "二つだけのノード選択が許されています" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "ウェイだけを選択してください。" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" - -#: ../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 "ただ一つだけのノードが選択されています。" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "垂直化" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "貼り付け" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "貼り付けバッファの内容を貼り付け" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "タグの貼り付け" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "{0} 読み込み中です" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "設定..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "全体の設定のページを開きます。" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "設定" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "やり直し" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "最後に戻した処理を再度行います。" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "レイヤーの名前変更" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "ファイル名も変える" - -#: ../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 "ウェイ方向反転" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "選択したウェイ全ての方向を反転します。" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "少なくとも１つのウェイを選択してください。" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "ウェイ方向反転" - -#: ../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 "保存" - -#: ../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 "最新データを保存します。" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "ファイル {0}は存在します。上書きしますか?" - -#: ../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 "空の文書" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "文書にデータが含まれない" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "それでも保存する" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "競合" - -#: ../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 "" -"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ" -"れます。続けますか？" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "競合を否定して保存する" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "OSMファイルの保存" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "GPXファイルの保存" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "レイヤーを保存" - -#: ../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 "名前をつけて保存…" - -#: ../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 "現在のデータを新規ファイルに保存" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "すべて選択" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ" -"ジェクトも選択します。" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "状況報告を見る" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"バグに添付されているであろう有用な情報と一緒にステータスレポートを表示する。" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "ヘルプ: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "状況報告" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "クリップボードにコピーして閉じる" - -#: ../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 "閉じる" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "ウェイを分割" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "選択したノードでウェイを分割" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "現在の選択は分割できません。" - -#: ../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] "選択したノードは、いずれかのウェイの中間ではありません。" - -#: ../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] "" -"一つ以上のウエイが、あなたの選択したこのノードを使っています。ウエイも選択し" -"てください。" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "選択したノードは同じウエイで共有されていません。" - -#: ../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] "選択したウエイは選択したノードをつかって構成されていません。" - -#: ../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 "" -"円形につながったのウエイの分割には、二つ以上のノードを選択する必要がありま" -"す。" - -#: ../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 "" -"ウエイは選択したノードで分割できません（ヒント：ウエイの真ん中のノードを選択" -"する）" - -#: ../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 "ウェイ{0}を{1}こに分割" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "変更した設定を閉じています..." - -#: ../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 "変更した設定を閉じています..." - -#: ../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 "変更セットを開いています…" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "GPXラインのトグル" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "生gpsポイント間に線を描画" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "グローバル設定 \"{0}\"　のトグル" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "ウェイを引き離す" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "複数のウェイに使われているノードを複製します。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "このノードは、何とも結合していません。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "どのノードも結合していません。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "どのウェイも結合していません。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "現在の選択は引き離せません。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "ほかを選択：" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* 1つのタグのついたノード、または" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* 1つ以上のウェイに使われている1つのノード, または" - -#: ../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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" - -#: ../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 "" -"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" - -#: ../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 "" -"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" - -#: ../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 "" -"備考：ウェイが選択されていれば、グルーされていないノードのあたらしいコピーが" -"つくられます。\n" -"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身" -"の\n" -"コピーが作られ、全てのノードが選択状態になります。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "ノードを引き離す" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "{0}ノードと見なす" - -#. 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 "{0}ノードを{1}ノードと見なす" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "取り消し" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "最後の操作を戻します" - -#: ../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 "選択なし" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "全てのオブジェクトで選択解除" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "全てを非選択(Focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "全てを非選択（Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "データの更新" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"サーバーからの新しいデーターで、データーレイヤーのデーターを更新する。(デー" -"ターの再ダウンロード)" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "OSMにアップロード" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "OSMサーバにすべての変更をアップロードします。" - -#: ../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 "未解決の競合があります。まずこれらの競合を解決してください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "アップロードするものがありません。最初にデータを取得してください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "アップロードする変更はありません。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "この変更をアップロードしますか?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "変更のアップロード" - -#: ../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 "既存のウェイに新しいノードを追加" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "アップロードする変更の概略コメントを入力してください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "マップ設定" - -#: ../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 "追加するオブジェクト:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "修正するオブジェクト:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "削除するオブジェクト:" - -#: ../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] "追加するオブジェクト:" - -#: ../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] "修正するオブジェクト:" - -#: ../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] "削除するオブジェクト:" - -#: ../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 "{0}の最後の変更" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "拡大" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "ズームアウト" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "戻る" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "前へ戻ります" - -#: ../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 "オーディオ: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "もっと速く" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "早回し" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "進む" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "次にジャンプ" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "次のマーカー" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "次のマーカーを再生。" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "再生/一時停止" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "音声を再生/一時停止" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "前のマーカー" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "一つ前のマーカーを再生。" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "遅く" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "ゆっくり再生" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "GPSデータをダウンロード中" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "ダウンロードされたGPXデータ" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "生のGPSデータ" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "データをダウンロード中" - -#: ../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 "データーはインポートされませんでした。" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMapデータ" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "ダウンロード {1}のうち{0} (残り {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "ダウンロード中にエラーです。" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "削除モード" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "ノードまたはウェイを削除します" - -#: ../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 "モード: {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 "" -"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに" -"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" - +#: ../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 @@ -2057,7 +1041,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 @@ -2066,6 +1051,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 @@ -2094,5 +1079,914 @@ #, java-format msgid "parameter ''{0}'' must not be null" -msgstr "" +msgstr "パラメータ ''{0}'' はヌルでなければなりません" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"ノードを結合できません：使用しているウェイを削除しないとけなくなります。" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "{0}ノードを結合する" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "選択を結合" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "現在選択されたプリミティブを他のレイヤーに結合" + +#: ../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 "鏡像" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "選択したノードやウェイの鏡像を作ります。" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "少なくとも1つはノードかウェイを選んでください。" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "上" + +#: ../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 "オブジェクト{0}を移動" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "下" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "左" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "右" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "移動 {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "オブジェクトの移動 {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 "オブジェクトを世界の外に移動できません。" + +#: ../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 "新規" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "新しい地図を作成します。" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "開く..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "ファイルを開く" + +#: ../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 "ファイル ''{0}''を開いています ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "場所を開く..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "URL を開く。" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "レイヤーに分ける" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "ダウンロードするURLの入力:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "ダウンロード先" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "ダウンロードURL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "直交した形状" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "二つだけのノード選択が許されています" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "ウェイだけを選択してください。" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" + +#: ../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 "" +"今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと
の望" +"まない結果を引き起こすかもしれません。
この警告にしたがって、投影法を変え" +"て見てください。
続けますか?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "ただ一つだけのノードが選択されています。" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "垂直化" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "貼り付け" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "貼り付けバッファの内容を貼り付け" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "タグの貼り付け" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "{0} タグを貼り付けています" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "{0} プリミテブまで" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "設定..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "全体の設定のページを開きます。" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "設定" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "やり直し" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "最後に戻した処理を再度行います。" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "レイヤーの名前変更" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "ファイル名も変える" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "ファイル ''{0}'' をリネームできません" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "ウェイ方向反転" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "選択したウェイ全ての方向を反転します。" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "少なくとも１つのウェイを選択してください。" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "ウェイ方向反転" + +#: ../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 "保存" + +#: ../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 "最新データを保存します。" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "ファイル {0}は存在します。上書きしますか?" + +#: ../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 "空の文書" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "それでも保存する" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "文書にデータが含まれない" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "競合" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "競合を否定して保存する" + +#: ../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 "" +"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ" +"れます。続けますか？" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "OSMファイルの保存" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "GPXファイルの保存" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "レイヤーを保存" + +#: ../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 "名前をつけて保存…" + +#: ../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 "現在のデータを新規ファイルに保存" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "すべて選択" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ" +"ジェクトも選択します。" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "状況報告を見る" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"バグに添付されているであろう有用な情報と一緒にステータスレポートを表示する。" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "ヘルプ: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "状況報告" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "クリップボードにコピーして閉じる" + +#: ../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 "閉じる" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "ウェイを分割" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "選択したノードでウェイを分割" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "現在の選択は分割できません。" + +#: ../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] "選択したノードは、いずれかのウェイの中間ではありません。" + +#: ../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] "" +"一つ以上のウエイが、あなたの選択したこのノードを使っています。ウエイも選択し" +"てください。" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "選択したノードは同じウエイで共有されていません。" + +#: ../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] "選択したウエイは選択したノードをつかって構成されていません。" + +#: ../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 "" +"円形につながったのウエイの分割には、二つ以上のノードを選択する必要がありま" +"す。" + +#: ../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 "" +"ウエイは選択したノードで分割できません（ヒント：ウエイの真ん中のノードを選択" +"する）" + +#: ../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 "ウェイ{0}を{1}こに分割" + +#: ../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 "GPXラインのトグル" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "生gpsポイント間に線を描画" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "グローバル設定 \"{0}\"　のトグル" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "ウェイを引き離す" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "複数のウェイに使われているノードを複製します。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "このノードは、何とも結合していません。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "どのノードも結合していません。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "どのウェイも結合していません。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "現在の選択は引き離せません。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "ほかを選択：" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* 1つのタグのついたノード、または" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* 1つ以上のウェイに使われている1つのノード, または" + +#: ../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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" + +#: ../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 "" +"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" + +#: ../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 "" +"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" + +#: ../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 "" +"備考：ウェイが選択されていれば、グルーされていないノードのあたらしいコピーが" +"つくられます。\n" +"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身" +"の\n" +"コピーが作られ、全てのノードが選択状態になります。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "ノードを引き離す" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "{0}ノードと見なす" + +#. 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 "{0}ノードを{1}ノードと見なす" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "取り消し" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "最後の操作を戻します" + +#: ../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 "選択なし" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "全てのオブジェクトで選択解除" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "全てを非選択(Focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "全てを非選択（Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "データの更新" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"サーバーからの新しいデーターで、データーレイヤーのデーターを更新する。(デー" +"ターの再ダウンロード)" + +#. 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 "データ更新中" + +#: ../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 "現在のデータセット中には id {0} のプリミティブが見つかりません" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "選択を更新" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "サーバから現在選択されたプリミティブを更新" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "更新用に選択されたプリミティブはありません。" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "選択は空です" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "OSMにアップロード" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "OSMサーバにすべての変更をアップロードします。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"レイヤー ''{0}' に未解決の競合があります。
最初に競合を解決してくだ" +"さい。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "アップロードするものがありません。最初にデータを取得してください。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "アップロードする変更はありません。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "{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 "データセット全体を同期" + +#: ../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 "" +"アップロード中。失敗: サーバーはあなたのノード・ウェ" +"イ・リレーションのどれかに、
もっと新しいバージョンのものを持っているよう" +"です。
この競合は、id {1} の {0} でおき" +"ました。
サーバーにあるバージョンは {2} で、あなたのは {3} です。

" +"競合したプリミティブのみを同期させるには、{4}をクリックして" +"ください。
全ローカルセットを同期させるには、{5} をク" +"リックしてください。
中止して編集を継続するには、{6} をク" +"リックしてください。
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "競合が検出されました" + +#. 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 "予期せぬ値が返って来ました。 {0} を受けとりました。" + +#: ../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 "" +"アップロード中。失敗: サーバーはあなたのノード・ウェ" +"イ・リレーションのどれかに、
もっと新しいバージョンのものを持っているよう" +"です。
全ローカルセットを同期させるには、{0} をクリックし" +"てください。
中止して編集を継続するには、{1} をクリックし" +"てください。
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "アップロード 失敗。
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "OSM API へのアップロード失敗" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "プリミティブ更新中" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "レイヤー ''{0}'' へデータをアップロード中" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "拡大" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "ズームアウト" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "戻る" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "前へ戻ります" + +#: ../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 "オーディオ: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "もっと速く" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "早回し" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "進む" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "次にジャンプ" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "次のマーカー" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "次のマーカーを再生。" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "再生/一時停止" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "音声を再生/一時停止" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "前のマーカー" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "一つ前のマーカーを再生。" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "遅く" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "ゆっくり再生" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "GPSデータをダウンロード中" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "ダウンロードされたGPXデータ" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "生のGPSデータ" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "データをダウンロード中" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "データーはインポートされませんでした。" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMapデータ" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "ダウンロード {1}のうち{0} (残り {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "次のエラーが一括ダウンロード中に発生しました: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "ダウンロード中にエラーです。" + +#: ../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 "" +"あなたのローカルセットにある{0} 個のプリミティブが、
おそらくサー" +"バーでは削除されています。これらをあとで削除したり、更新しようとすると、サー" +"バーは
競合
と報告するでしょう。
サーバー上のこれらのプリミティブの" +"状態を確認するには
{1}をクリックしてください。
無視す" +"るには、{2}をクリックしてください。
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "削除または移動されたプリミティブ" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "削除モード" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "ノードまたはウェイを削除します" + +#: ../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 "モード: {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 "" +"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに" +"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 @@ -2207,18 +2101,18 @@ "を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." -#: ../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 "選択" -#: ../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" @@ -2226,17 +2120,17 @@ msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" -#: ../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 +msgstr "要素を移動" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgstr "これらを移動する。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +msgstr "移動を取り消す" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 #, java-format msgid "" @@ -2245,8 +2139,11 @@ "Really move them?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間" +"違いでしょう。\n" +"本当に移動しますか？" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "常に移動し、ダイアログ表示は不要" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2295,5 +2192,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51 msgid "Can't search because there is no loaded data." -msgstr "" +msgstr "データがロードされていないので検索できません。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 @@ -2370,7 +2267,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - 指定されたIDを持つオブジェクト" +msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2421,41 +2317,41 @@ msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "検索開始" -#: ../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 "\"{0}\"にマッチするものが見つからない" -#: ../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 "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../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 "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../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 "{0} の一致が見つかりました" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2469,5 +2365,5 @@ "{2}" -#: ../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 "" @@ -2475,10 +2371,10 @@ "ださい: key=value" -#: ../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 +msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2487,26 +2383,26 @@ "\"relation\"です。" -#: ../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 "想定外のトークン: {0}" -#: ../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 "orに引数がありません。" -#: ../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 "not に引数がありません。" -#: ../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 "" @@ -2514,9 +2410,11 @@ "nodes or range, for example nodes:10-20" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608 +"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ" +"い、例えば ノード: 10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" +msgstr "不正なid演算子の値: {0}。数字を入力してください。" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 @@ -2547,65 +2445,65 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87 msgid "Error while communicating with server." -msgstr "" +msgstr "サーバとの通信中にエラー。" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "ノードを追加" +msgstr "ノード {0} を追加" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "ウェイ {0} を追加" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "リレーション: {0}" +msgstr "リレーション {0} を追加" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "{0}このオブジェクトを変更" +msgstr "ノード {0} を変更" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "{0}の最後の変更" +msgstr "ウェイ {0} を変更" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "関連の変更" +msgstr "リレーション {0} を変更" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "ノード \"{1}\" の \"{0}\" を削除" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "ウェイ \"{1}\" の \"{0}\" を削除" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" +msgstr "リレーション \"{1}\" の \"{0}\" を削除" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "ノード ''{2}''に {0}={1} を設定" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "ウェイ ''{2}''に {0}={1} を設定" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Set {0}={1} for {2} ''{3}''" +msgstr "リレーション ''{2}''に {0}={1} を設定" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2630,5 +2528,5 @@ #, java-format msgid "Change relation member role for {0} {1}" -msgstr "" +msgstr "リレーションのメンバー{0}のロールを {1} に変更" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 @@ -2638,9 +2536,11 @@ "conflict can't be added." msgstr "" +"レイヤー ''{0}'' は、既にプリミティブ
''{1}''
で、競合していま" +"す。この競合は加えることができません。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 msgid "Double conflict" -msgstr "" +msgstr "二重の競合" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 @@ -2650,9 +2550,11 @@ "primitmive ''{1}''" msgstr "" +"警告: レイヤー ''{0}'' は、もうぞんざいしません。プリミティブ ''{1}'' での競" +"合も取り除けません。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" -msgstr "" +msgstr "''{0}'' に競合を追加" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2661,9 +2563,10 @@ msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" msgstr "" +"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 #, java-format msgid "Resolve conflicts in coordinates in {0}" -msgstr "" +msgstr "{0} 内の座標の競合を解決" #. should not happen @@ -2671,29 +2574,29 @@ #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "cannot resolve undecided conflict" -msgstr "" +msgstr "未決の競合を解決できません" #: ../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] "削除 {0} {1}" +msgstr[0] "{0} のオブジェクトを削除" #: ../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] "削除モード" +msgstr[0] "{0} のノードを削除" #: ../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] "削除 {0} {1}" +msgstr[0] "{0} のウェイを削除" #: ../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] "関連から削除" +msgstr[0] "{0} のリレーションを削除" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2707,20 +2610,20 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n" -"関連から削除しますか？" +"選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されています。" +"
リレーションから削除しますか?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"選択\"{0}\" は、関連 \"{1}\" で使われています。\n" -"関連から削除しますか？" +"選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレーショ" +"ンから削除しますか？" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2731,5 +2634,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." @@ -2743,10 +2646,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" -msgstr "" +msgstr "削除確認" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" +msgstr "{0} 内の削除済み状態の競合を解決" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 @@ -2754,15 +2657,14 @@ msgid "Move {0} node" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} のノードを移動" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 msgid "Purging 1 primitive" -msgstr "" +msgstr "1 つのプリミティブを破棄" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 #, java-format msgid "removing reference from way {0}" -msgstr "" +msgstr "ウェイ {0}から、参照を取り除く" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 @@ -2772,29 +2674,31 @@ "{1}" msgstr "" +"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、" +"{1} です。" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 #, java-format msgid "removing reference from relation {0}" -msgstr "" +msgstr "リレーション {0}から、参照を除きます。" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" -msgstr "" +msgstr "リレーション {0} のメンバーリスト内の競合を解決" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "ノード ''{0}'' をポジション {1} でリレーション ''{2}'' から削除" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "ウェイ ''{0}'' をポジション {1} でリレーション ''{2}'' から削除" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "リレーション ''{0}'' をポジション {1} でリレーション ''{2}'' から削除" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2802,6 +2706,5 @@ msgid "Rotate {0} node" msgid_plural "Rotate {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} のノードを回転" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 @@ -2810,47 +2713,47 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "ノード {1} の {0} タグ競合を解決" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "ウェイ {1} の {0} タグ競合を解決" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "リレーション {1} の {0} タグ競合を解決" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" -msgstr "" +msgstr "{0} のプリミティブを復活" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "ノード {0} のバージョン競合を解決" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "ウェイ {0} のバージョン競合を解決" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "{1}個のオブジェクト中の{0}個の競合を解決" +msgstr "リレーション {0} のバージョン競合を解決" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format msgid "Resolve conflicts in node list of of way {0}" -msgstr "" +msgstr "ウェイ {0} のノードリストの競合を解決" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "主データセットはノード {0} を含んでいません" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -2922,5 +2825,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 @@ -2935,4 +2838,6 @@ "isn't a directory." msgstr "" +"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは" +"ありません。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -2942,4 +2847,6 @@ "isn't a directory." msgstr "" +"設定の初期化に失敗しました。
設定ディレクトリ ''{0}'' はディレクトリ" +"ではありません。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 @@ -2949,4 +2856,5 @@ "preference directory: {0}" msgstr "" +"警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 @@ -2956,4 +2864,6 @@ "preference directory: {0}" msgstr "" +"設定を初期化するのに失敗しました。
作成に失敗した設定ディレクトリ: " +"{0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 @@ -2962,4 +2872,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"警告: 設定ファイル ''{0}'' がありません。デフォルトの設定ファイルを作成しま" +"す。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -2969,4 +2881,5 @@ "file." msgstr "" +"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 @@ -2976,12 +2889,15 @@ "to default: {0}" msgstr "" +"設定の初期化に失敗しました。
設定ファイルをデフォルト: {0} にリセッ" +"トできません" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。" +"設定ファイルにはエラーがあります。
古いもののバックアップを
{0}" +"
に取って、新しい初期設定ファイルを作ります。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3012,9 +2928,11 @@ "{1}" msgstr "" +"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外" +"の内容: {1}" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 #, java-format msgid "already registered a conflict for primitive ''{0}''" -msgstr "" +msgstr "プリミティブ ''{0}'' には既に競合が登録されています" #. * @@ -3048,28 +2966,53 @@ 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 msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 +msgstr "変更セット {0}" + +#: ../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 +msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325 +#, fuzzy, java-format +msgid "paramete''{0}'' must not be null" +msgstr "パラメータ ''{0}'' はヌルでなければなりません" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../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 "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "予期しないカラムインデックス。 {0} を受け取りました" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257 msgid "a primitive with id=0 can't be invisible" -msgstr "" +msgstr "id=0 のプリミティブは非表示にできません" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "id > 0 でなければなりませんが、{0} を受け取りました" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "id > 0 でなければなりませんが、{0} を受け取りました" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3077,4 +3020,5 @@ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" +"パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 @@ -3082,9 +3026,11 @@ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" 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 +"パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取り" +"ました" + +#: ../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 " @@ -3092,12 +3038,17 @@ 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 "" + #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 msgid "There's no primitive with version {0} in this history" -msgstr "" +msgstr "この履歴にはバージョン {0} のプリミティブはありません" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163 msgid "There's no version valid at date ''{0}'' in this history" -msgstr "" +msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 @@ -3108,17 +3059,17 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 msgid "no earliest version found. History is empty." -msgstr "" +msgstr "前のバージョンがありません。履歴は空です。" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 msgid "no latest version found. History is empty." -msgstr "" +msgstr "最新のバージョンがありません。履歴は空です。" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "" +msgstr "このデータセットには id {0} のプリミティブはありません" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84 msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -msgstr "" +msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 @@ -3127,8 +3078,9 @@ msgid "parameter ''{0}'' > 0 expected, got ''{1}''" msgstr "" +"パラメータ ''{0}'' > 0 である必要がありますが、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" -msgstr "" +msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3138,9 +3090,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." @@ -3149,118 +3101,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 "メンバー \"{0}\"を関連から削除" -#: ../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 "ウエイ\"{0}\"は二つ未満のポイントです。" -#: ../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 "二つ以上の\"from\"ウェイがあります。" -#: ../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 "二つ以上の\"to\"ウェイがあります。" -#: ../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 "不明なロール\"{0}\"です。" -#: ../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 "{0}のメンバーのタイプが不明" -#: ../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 "\"from\"ウェイが見つかりません" -#: ../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 "\"to\"ウェイが見つかりません" -#: ../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 "\"from\"ウェイは、\"via\"ノードで開始または終了していません。" -#: ../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 "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。" -#: ../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 "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。" -#: ../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 "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。" -#: ../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 "制約条件{0}のスタイルがありません。" -#: ../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 "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../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 "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../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 "マルチポリゴン用の外側のウェイが ''{0}'' にありません。" -#: ../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 "ウエイ \"{0}\"と\"{1}\"の交差する点" -#: ../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 "内部のウェイ ''{0}''が外側にあります。" -#: ../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 "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。" -#: ../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 "外側のウェイ ''{0}''のスタイルが合いません。" -#: ../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 "テキスト" @@ -3283,5 +3235,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" @@ -3291,5 +3243,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" @@ -3299,5 +3251,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" @@ -3382,9 +3334,10 @@ msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" +"''{0}''
からブックマークが読み込めません
エラー内容: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "ブックマークを書き込めません。
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 @@ -3410,5 +3363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "鉄道" @@ -3438,129 +3391,36 @@ msgstr[0] "{0} メンバー" -#: ../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 "不明な" - -#: ../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:59 +msgid "Precondition violation" +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 -msgid "Precondition violation" -msgstr "" +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 "IO 例外" + +#: ../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 +#, fuzzy +msgid "Bad Request" +msgstr "ラケットボールの編集" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "不明なホスト" -#: ../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 "" +msgstr "プリミティブは削除済み" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3702,5 +3562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "Javaシステムのプロパティとして提供されるオプション" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3710,5 +3570,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "Change the folder for all user settings" -msgstr "" +msgstr "全てのユーザ設定用フォルダを変更" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3777,5 +3637,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}" @@ -3877,5 +3737,5 @@ #, java-format msgid "Layer ''{0}'' must be in list of layers" -msgstr "" +msgstr "レイヤー ''{0}'' はレーヤーのリスト中になければなりません" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3938,5 +3798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" -msgstr "" +msgstr "プロパティ" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 @@ -3953,5 +3813,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" -msgstr "" +msgstr "ノード" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 @@ -3964,19 +3824,19 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" -msgstr "" +msgstr "解決が必要な保留中のタグ競合はありません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" -msgstr "" +msgstr "タグ({0} 競合)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" -msgstr "" +msgstr "解決待ちの保留中タグ競合 {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" -msgstr "" +msgstr "ノード(解決済み)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 @@ -3984,16 +3844,18 @@ "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +"結合されたノードリストが固定されました。このウェイのノードリストには保留中の" +"競合はありません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" -msgstr "" +msgstr "ノード(競合あり)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" -msgstr "" +msgstr "このウェイのノードリスト内の保留中競合" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" -msgstr "" +msgstr "メンバー(解決済み)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 @@ -4002,28 +3864,30 @@ "relation" msgstr "" +"結合されたメンバーリストが固定されました。このリレーションのメンバーリストに" +"は保留中の競合はありません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" -msgstr "" +msgstr "メンバー(競合あり)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" -msgstr "" +msgstr "このリレーションのメンバーリスト内の保留中競合" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" -msgstr "" +msgstr "保留中のプロパティ競合はありません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" -msgstr "" +msgstr "プロパティ(競合あり)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "解決が必要な保留中競合プロパティ" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 msgid "Conflict Resolution" -msgstr "" +msgstr "衝突の解決" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 @@ -4031,5 +3895,5 @@ #, java-format msgid "parameter current out of range: got {0}" -msgstr "" +msgstr "現在のパラメータは範囲外です: {0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 @@ -4047,22 +3911,22 @@ #, java-format msgid "item {0} not found in list" -msgstr "" +msgstr "アイテム {0} はリストに見つかりません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 msgid "lock scrolling" -msgstr "" +msgstr "スクロールをロック" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 msgid "Compare " -msgstr "" +msgstr "比較 " #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" -msgstr "" +msgstr "自分のバージョン" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 msgid "List of elements in my dataset, i.e. the local dataset" -msgstr "" +msgstr "自分のデータセットの要素リスト、例：ローカルデータセット" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 @@ -4070,5 +3934,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 msgid "Merged version" -msgstr "" +msgstr "結合されたバージョン" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 @@ -4081,25 +3945,25 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" -msgstr "" +msgstr "相手のバージョン" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 msgid "List of elements in their dataset, i.e. the server dataset" -msgstr "" +msgstr "相手のデータセットの要素リスト、例：サーバデータセット" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 msgid "> top" -msgstr "" +msgstr "> 先頭" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "" +msgstr "自分の選択したノードを結合されたノードリストの先頭にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 msgid "> bottom" -msgstr "" +msgstr "> 最後" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 msgid "Copy my selected elements to the end of the list of merged elements" -msgstr "" +msgstr "自分の選択した要素を結合された要素リストの最後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 @@ -4108,4 +3972,5 @@ "merged elements" msgstr "" +"自分の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 @@ -4114,12 +3979,13 @@ "merged elements" msgstr "" +"自分の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 msgid "Copy their selected element to the start of the list of merged elements" -msgstr "" +msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 msgid "Copy their selected elements to the end of the list of merged elements" -msgstr "" +msgstr "相手の選択した要素を、結合された要素リストの最後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 @@ -4128,4 +3994,5 @@ "of merged elements" msgstr "" +"相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 @@ -4134,8 +4001,9 @@ "merged elements" msgstr "" +"相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "上" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 @@ -4145,5 +4013,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "下" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 @@ -4152,4 +4020,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 @@ -4160,23 +4030,23 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 msgid "Remove the selected entries from the list of merged elements" -msgstr "" +msgstr "結合された要素のリストから選択したエントリを削除" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "固定" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 msgid "Freeze the current list of merged elements" -msgstr "" +msgstr "結合された要素の現在のリストを固定" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 msgid "Unfreeze" -msgstr "" +msgstr "固定解除" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 msgid "Unfreeze the list of merged elements and start merging" -msgstr "" +msgstr "結合された要素のリスト固定を解除して結合をはじめる" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 @@ -4185,4 +4055,6 @@ "Click {0} to start merging my and their entries" msgstr "" +"{0} をクリックして自分と相手のエントリの結合を開始" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 @@ -4192,4 +4064,6 @@ "html>" msgstr "" +"{0} をクリックして自分と相手のエントリの結合を完了" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 @@ -4197,6 +4071,5 @@ msgid "My version ({0} entry)" msgid_plural "My version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "自分のバージョン ({0} エントリ)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 @@ -4204,6 +4077,5 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "結合されたバージョン ({0} エントリ)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 @@ -4211,6 +4083,5 @@ msgid "Their version ({0} entry)" msgid_plural "Their version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "相手のバージョン ({0} エントリ)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 @@ -4221,8 +4092,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 @@ -4236,5 +4107,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" -msgstr "" +msgstr "パラメータ '{0}' はヌル以外でなければなりません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4254,9 +4125,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "ノード" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 msgid "Merged nodes not frozen yet. Can't build resolution command" msgstr "" +"結合されたノードがまだ固定されていません。解決コマンドをビルドできません" #. should not happen @@ -4264,5 +4136,5 @@ #, java-format msgid "unexpected column index. Got {0}" -msgstr "" +msgstr "予期しないカラムインデックス。 {0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 @@ -4271,19 +4143,19 @@ "An error occurred while communicating with the server
Details: {0}" -msgstr "" +msgstr "サーバとの通信中にエラー発生
詳細: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 msgid "Communication with server failed" -msgstr "" +msgstr "サーバとの通信失敗" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" -msgstr "" +msgstr "はい、これも削除を取り消します" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" -msgstr "" +msgstr "いいえ、操作をキャンセルします" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 @@ -4296,5 +4168,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 msgid "Undelete additional nodes?" -msgstr "" +msgstr "追加のノードの削除を取り消しますか？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 @@ -4312,5 +4184,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79 msgid "Properties in my dataset, i.e. the local dataset" -msgstr "" +msgstr "自分のデータセットのプロパティ、例：ローカルデータセット" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 @@ -4319,20 +4191,22 @@ "elements when merge decisions are applied." msgstr "" +"結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプ" +"ロパティを置換します。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 msgid "Properties in their dataset, i.e. the server dataset" -msgstr "" +msgstr "相手のデータセットのプロパティ、例：ローカルデータセット" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 msgid "Coordinates:" -msgstr "" +msgstr "座標:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 msgid "Deleted State:" -msgstr "" +msgstr "削除済み状態:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Visible State:" -msgstr "" +msgstr "表示状態:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 @@ -4345,5 +4219,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 "削除された" @@ -4351,59 +4225,59 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 msgid "not deleted" -msgstr "" +msgstr "削除されていません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "visible (on the server)" -msgstr "" +msgstr "表示(サーバ上)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" -msgstr "" +msgstr "非表示(サーバ上)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Keep a clone of the local version" -msgstr "" +msgstr "ローカルバージョンのクローンを残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" -msgstr "" +msgstr "ローカルデータセットから物理的に削除" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 msgid "Keep my coordiates" -msgstr "" +msgstr "自分の座標を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 msgid "Keep their coordiates" -msgstr "" +msgstr "相手の座標を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 msgid "Undecide conflict between different coordinates" -msgstr "" +msgstr "異なる座標間の競合を未決にする" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 msgid "Keep my deleted state" -msgstr "" +msgstr "自分の削除済み状態を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 msgid "Keep their deleted state" -msgstr "" +msgstr "相手の削除済み状態を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 msgid "Undecide conflict between deleted state" -msgstr "" +msgstr "削除済み状態間の競合を未決にする" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 msgid "Keep my visible state" -msgstr "" +msgstr "自分の表示状態を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 msgid "Yes, reset the id" -msgstr "" +msgstr "はい、id をリセットします" #: ../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 "" +msgstr "いいえ、異常終了します" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 @@ -4414,16 +4288,19 @@ "yo agree?" msgstr "" +"あなたのローカルバージョンを残すために、JOSMは
プリミティブ {0} の" +"ID を0にリセットしなければなりません。
次回のアップロード時にサーバが新し" +"いidを割り当てます。
よろしいですか？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" -msgstr "" +msgstr "id を0 にリセット" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Keep their visible state" -msgstr "" +msgstr "相手の表示状態を残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Yes, purge it" -msgstr "" +msgstr "はい、破棄します" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 @@ -4433,14 +4310,17 @@ "dataset.
Do you agree?" msgstr "" +"JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削除" +"しなければなりません。
よろしいですか？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 msgid "Remove from dataset" -msgstr "" +msgstr "データセットから削除" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 msgid "Undecide conflict between visible state" -msgstr "" +msgstr "表示状態間の競合を未決にする" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 @@ -4452,7 +4332,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +msgstr "プリミティブ" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120 msgid "merged nodes not frozen yet. Can't build resolution command" msgstr "" @@ -4469,5 +4349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51 msgid "" -msgstr "" +msgstr "<未定義>" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 @@ -4477,5 +4357,5 @@ #, java-format msgid "The merged dataset will not include a tag with key {0}" -msgstr "" +msgstr "結合されたデータセットはキー {0} を持つタグを含みません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48 @@ -4483,5 +4363,5 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "" +msgstr "自分のデータセットはキー {0} を持つタグを含みません" #. setting up the properties table @@ -4522,12 +4402,13 @@ msgid "Parameter 'col' must be 0 or 1. Got {0}" msgstr "" +"パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "自分のバージョン (ローカルデータセット)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149 msgid "Their version (server dataset)" -msgstr "" +msgstr "相手のバージョン (サーバデータセット)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 @@ -4538,17 +4419,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" +msgstr "ローカルデータセットから選択されたキー/値のペアを残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" +msgstr "サーバデータセットから選択されたキー/値のペアを残す" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Undecide" -msgstr "" +msgstr "未決" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "選択されたタグを未決にマーク" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 @@ -4556,5 +4437,41 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "相手のデータセットはキー {0} を持つタグを含みません" + +#: ../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 "解決が必要な保留中のタグ競合はありません" + +#: ../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 @@ -4568,24 +4485,23 @@ msgstr "全て" -#: ../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 "色選択" - -#: ../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 +msgstr "どちらの値を残すか決定してください" + +#: ../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 +msgstr "値 ''{0}'' はキー ''{1}'' に割り当てられます" + +#: ../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 +msgstr "キー ''{0}'' とその全ての値は削除されます" + +#: ../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}''" @@ -4595,5 +4511,5 @@ #, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "" +msgstr "パラメータ ''{0}'' は空以外でなければなりません" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4604,34 +4520,33 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 msgid "tag collection doesn't include the selected value ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 +msgstr "タグコレクションには選択された値 ''{0}'' が含まれていません" + +#: ../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 +msgstr "未決定です" + +#: ../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 "まだ実装されていません。" +msgstr "未決定です" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "" +msgstr "ノードからのタグ" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "ウエイから" +msgstr "ウェイからのタグ" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "関連から削除" +msgstr "リレーションからのタグ" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "" +msgstr "貼り付けられたタグの競合" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4653,24 +4568,8 @@ msgstr[0] "{0} 関連" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "解像度の変更" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "競合を解決する" - -#: ../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 "貼り付け" +msgstr "貼り付け ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4685,8 +4584,76 @@ #: ../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}ウェイ" +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 "このリレーションから現在選択されたメンバーを削除" + +#: ../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 "場所" + +#: ../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 +#, fuzzy +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 +#, fuzzy +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 "値" + +#: ../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 "一方通行" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "リビジョン" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4713,5 +4680,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}" @@ -4742,5 +4709,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." @@ -4749,21 +4716,21 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 msgid "Cancel conflict resolution and close the dialog" -msgstr "" +msgstr "競合の解決をキャンセルしてダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180 msgid "Apply resolved conflicts and close the dialog" -msgstr "" +msgstr "解決済みの競合を適用してダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" -msgstr "" +msgstr "解決を適用" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" -msgstr "" +msgstr "とにかく閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" -msgstr "" +msgstr "解決を続ける" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 @@ -4779,14 +4746,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 msgid "Conflict not resolved completely" -msgstr "" +msgstr "競合は完全には解決されていません" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" -msgstr "" +msgstr "競合を解決" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243 #, java-format msgid "Resolve conflicts for ''{0}''" -msgstr "" +msgstr "''{0}'' の競合を解決する" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -4802,5 +4769,5 @@ #, java-format msgid "index out of bounds Got {0}" -msgstr "" +msgstr "範囲外のインデックス。{0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270 @@ -4809,21 +4776,21 @@ #, java-format msgid "Node {0}" -msgstr "" +msgstr "ノード {0}" #: ../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 "レイヤ{0}" +msgstr "ウェイ {0}" #: ../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 "リレーション: {0}" +msgstr "リレーション {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" -msgstr "" +msgstr "履歴アイテム" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317 @@ -4834,13 +4801,15 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341 msgid "Show" -msgstr "" +msgstr "表示" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342 msgid "Display the history of the selected primitive" -msgstr "" +msgstr "選択されたプリミティブの履歴を表示" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" +"ダイアログはまだ作成されていません。最初に createInstance() を呼び出してくだ" +"さい" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 @@ -4867,13 +4836,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" -msgstr "" +msgstr "有効化" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420 msgid "Activate the selected layer" -msgstr "" +msgstr "選択されたレイヤーを有効化" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 msgid "Merge this layer into another layer" -msgstr "" +msgstr "このレイヤーを他のレイヤーに結合" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581 @@ -4887,5 +4856,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" -msgstr "" +msgstr "レイヤーについての情報" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 @@ -4904,5 +4873,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 "<差異あり>" @@ -4960,5 +4929,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 "追加" @@ -5008,5 +4977,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 "リレーション" @@ -5036,5 +5005,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412 msgid "Create a copy of this relation and open it in another editor window" -msgstr "" +msgstr "このリレーションのコピーを作成し、他のエディタウィンドウで開く" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5101,21 +5070,20 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, fuzzy, java-format +#, java-format msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "作者" +msgstr[0] "{0} 作者" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 msgid "Select primitives submitted by this user" -msgstr "" +msgstr "このユーザが登録したプリミティブを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 msgid "Show info" -msgstr "" +msgstr "情報を表示" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "この機能の詳細情報" +msgstr "ユーザについての情報付きでブラウザを起動" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5131,8 +5099,10 @@ "missing on this system." msgstr "" +"URL の作成に失敗しました。エンコーディング ''{0}''は
このシステムに" +"はありません。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 msgid "Missing encoding" -msgstr "" +msgstr "エンコーディングがありません" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 @@ -5151,17 +5121,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" -msgstr "" +msgstr "全ての子リレーションをダウンロード(再帰的)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" -msgstr "" +msgstr "全ての子をダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 msgid "Download selected relations" -msgstr "" +msgstr "選択したリレーションをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 msgid "Download Selected Children" -msgstr "" +msgstr "選択した子をダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 @@ -5169,10 +5139,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502 msgid "Download relation members" -msgstr "" +msgstr "リレーションメンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 msgid "Conflicts in data" -msgstr "" +msgstr "データ内の競合" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 @@ -5182,8 +5152,9 @@ "loaded" msgstr "" +"子リレーション
{0}
はサーバ上から削除されました。ロードできません" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 msgid "Relation is deleted" -msgstr "" +msgstr "リレーションは削除されました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 @@ -5191,31 +5162,26 @@ #, java-format msgid "Downloading relation {0}" -msgstr "" +msgstr "リレーション {0} をダウンロード中" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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}" -msgstr "" +msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Tags and Members" -msgstr "" +msgstr "タグとメンバ－" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173 msgid "Parent Relations" -msgstr "" +msgstr "親リレーション" #: ../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 "" +msgstr "子リレーション" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5229,9 +5195,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 msgid "Remove them, clean up relation" -msgstr "" +msgstr "削除し、リレーションをクリーンナップ" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 msgid "Ignore them, leave relation as is" -msgstr "" +msgstr "無視し、リレーションはそのまま" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 @@ -5242,8 +5208,11 @@ "html>" msgstr "" +"このリレーションには既にひとつ以上の
プリミティブ ''{0}''
を参照" +"しているメンバーがあります。
本当に他のリレーションメンバーを追加します" +"か？" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690 msgid "Multiple members referring to same primitive" -msgstr "" +msgstr "複数のメンバーが同じプリミティブを参照しています" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 @@ -5254,4 +5223,6 @@ "''{0}''." msgstr "" +"リレーション自身に追加しようとしています。

これは循環参照を引き" +"起こすので薦められません。
リレーション ''{0}'' をスキップします。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 @@ -5259,4 +5230,5 @@ "Add all primitives selected in the current dataset before the first member" msgstr "" +"現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 @@ -5264,4 +5236,5 @@ "Add all primitives selected in the current dataset after the last member" msgstr "" +"現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802 @@ -5270,4 +5243,6 @@ "member" msgstr "" +"現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前" +"に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 @@ -5276,8 +5251,10 @@ "member" msgstr "" +"現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後" +"に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 msgid "Remove all members referring to one of the selected primitives" -msgstr "" +msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除" #. putValue(NAME, tr("Remove Selected")); @@ -5290,5 +5267,5 @@ msgid "" "Select relation members which refer to primitives in the current selection" -msgstr "" +msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 @@ -5298,17 +5275,18 @@ "selection" msgstr "" +"現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Select primitives for selected relation members" -msgstr "" +msgstr "選択されたリレーションメンバーのプリミティブを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961 msgid "Sort the relation members" -msgstr "" +msgstr "リレーションメンバーをソート" #. putValue(NAME, tr("Sort")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Relation Editor: Sort" -msgstr "" +msgstr "リレーションエディタ: ソート" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 @@ -5319,5 +5297,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979 msgid "Relation Editor: Move Up" -msgstr "" +msgstr "リレーションエディタ: 上へ移動" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995 @@ -5328,26 +5306,26 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998 msgid "Relation Editor: Move Down" -msgstr "" +msgstr "リレーションエディタ: 下へ移動" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "このリレーションから現在選択されたメンバーを削除" #. putValue(NAME, tr("Remove")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017 msgid "Relation Editor: Remove" -msgstr "" +msgstr "リレーションエディタ: 削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 msgid "Delete the currently edited relation" -msgstr "" +msgstr "現在編集されたリレーションを削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 msgid "Yes, create a conflict and close" -msgstr "" +msgstr "はい、競合を作成して閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117 msgid "No, continue editing" -msgstr "" +msgstr "いいえ、編集を続ける" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 @@ -5357,8 +5335,10 @@ "conflict and close the editor?" msgstr "" +"このリレーションはエディタ以外で変更されています。
変更を適用して編" +"集を続けることはできません

競合を作成してエディタを閉じますか？" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Conflict in data" -msgstr "" +msgstr "データ中に競合" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 @@ -5368,12 +5348,14 @@ "
Please resolve this conflict first, then try again." msgstr "" +"レイヤー ''{0}''には既にプリミティブ ''{1}''
に競合があります。
" +"最初にこの競合を解決してからやり直してください。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 msgid "Apply the current updates" -msgstr "" +msgstr "現在の更新を適用" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 msgid "Apply the updates and close the dialog" -msgstr "" +msgstr "更新を適用してダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 @@ -5390,13 +5372,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Cancel the updates and close the dialog" -msgstr "" +msgstr "更新をキャンセルしてダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241 msgid "Add an empty tag" -msgstr "" +msgstr "空のタグを追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Delete the currently selected tags" -msgstr "" +msgstr "現在選択されているタグを削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 @@ -5410,13 +5392,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Relation Editor: Download Members" -msgstr "" +msgstr "リレーションエディタ: メンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340 msgid "Sets a role for the selected members" -msgstr "" +msgstr "選択されたメンバーにロールをセット" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Apply Role" -msgstr "" +msgstr "ロールを適用" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356 @@ -5427,16 +5409,18 @@ "new role?" msgstr "" +"空のロールを {0} プリミティブにセットしようとしています。
これはロー" +"ルを削除することになります。
新しいロールを本当に適用しますか？" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360 msgid "Yes, apply it" -msgstr "" +msgstr "はい、適用します" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 msgid "No, don't apply" -msgstr "" +msgstr "いいえ、適用しません" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Confirm empty role" -msgstr "" +msgstr "空のロールを確認" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 @@ -5451,9 +5435,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214 msgid "Zooming disabled because layer of this relation is not active" -msgstr "" +msgstr "このリレーションのレイヤーは有効でないのでズームは無効化されました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219 msgid "Zooming disabled because there is no selected member" -msgstr "" +msgstr "選択されたメンバーが無いのでズームは無効化されました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 @@ -5463,14 +5447,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 msgid "Linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 +msgstr "リンク済み" + +#: ../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}" -msgstr "" +msgstr "参照リレーションをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, fuzzy, java-format +msgid "child.getId() >0 expected. Got {1}" +msgstr "子id > 0 でなければなりません。{1} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 @@ -5480,41 +5464,40 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 msgid "Load parent relations" -msgstr "" +msgstr "親リレーションをロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "早期読み込みプラグインのロード中" +msgstr "親リレーションをロード中" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" -msgstr "" +msgstr "現在選択されているリレーションを編集" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" -msgstr "変更の適用" +msgstr "変更を適用" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" +msgstr "レイヤー ''{0}'' に新しいリレーションを作成" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" +msgstr "レイヤー ''{0}'' の新しいリレーションを編集" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "レイヤー ''{1}'' のリレーション #{0} を編集" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 msgid "Load relation" -msgstr "" +msgstr "リレーションをロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 msgid "Warning: ignoring exception because task was cancelled. Exception was: " -msgstr "" +msgstr "警告: タスクがキャンセルされたので例外を無視。例外: " #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 @@ -5608,5 +5591,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "地名" @@ -5684,9 +5667,13 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"ズーム: マウスホイール、ダブルクリックまたは Ctrl + Up/Down マップ" +"移動: 右クリックしたままマウスを動かすか、カーソルキーを使用。 選択: クリック" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5718,28 +5705,28 @@ #, java-format msgid "History for node {0}" -msgstr "" +msgstr "ノード {0} の履歴" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 #, java-format msgid "History for way {0}" -msgstr "" +msgstr "ウェイ {0} の履歴" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 #, java-format msgid "History for relation {0}" -msgstr "" +msgstr "リレーション {0} の履歴" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" -msgstr "" +msgstr "ダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "サーバに現在の設定をアップロードします" +msgstr "履歴をサーバからリロード" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" +"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182 @@ -5752,9 +5739,9 @@ #, java-format msgid "failed to set reference. reference version {0} not available in history" -msgstr "" +msgstr "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199 msgid "history not initialized yet. Failed to set current primitive." -msgstr "" +msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204 @@ -5765,25 +5752,25 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 msgid "Load history" -msgstr "" +msgstr "履歴をロード" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "想定外のトークン: {0}" +msgstr "id > 0 でなければなりませんが、{0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 #, java-format msgid "Loading history for node {0}" -msgstr "" +msgstr "ノード {0} の履歴をロード中" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 #, java-format msgid "Loading history for way {0}" -msgstr "" +msgstr "ウェイ {0} の履歴をロード中" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 #, java-format msgid "Loading history for relation {0}" -msgstr "" +msgstr "リレーション {0} の履歴をロード中" #. item "Streets/Motorway" text "Reference" @@ -6618,52 +6605,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 "名前" @@ -6673,21 +6660,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 "関連の変更" +msgstr "変更セット情報" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "この機能の詳細情報" +msgstr "変更セットについての情報とともにブラウザを起動" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "{0}の最後の変更" +msgstr "変更セット {0} を表示" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6698,5 +6683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" -msgstr "" +msgstr "バージョン" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6705,17 +6690,16 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "ストリートの名前" +msgstr "ファイル名を選択" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 msgid "Yes" -msgstr "" +msgstr "はい" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 msgid "No" -msgstr "" +msgstr "いいえ" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 @@ -6723,9 +6707,10 @@ msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" +"レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded" -msgstr "" +msgstr "レイヤー ''{0}'' にはアップロードする修正はありません" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 @@ -6735,18 +6720,19 @@ "''{1}''." msgstr "" +"レイヤー ''{0}'' は修正されているのでその関連ファイル ''{1}'' に保存する必要" +"があります。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 #, java-format msgid "Layer ''{0}'' has no modifications to be saved" -msgstr "" +msgstr "レイヤー ''{0}'' には保存する修正はありません" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 msgid "No file associated with this layer" -msgstr "" +msgstr "このレイヤーには関連するファイルがありません" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "値を選択してください" +msgstr "ファイルを選択してください" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6759,4 +6745,5 @@ msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" +"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 @@ -6769,17 +6756,17 @@ #, java-format msgid "Saving layer to ''{0}'' ..." -msgstr "" +msgstr "レイヤーを ''{0}'' に保存中..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" -msgstr "" +msgstr "未保存の変更 - 終了前に保存/アップロード？" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" -msgstr "" +msgstr "未保存の変更 - 削除前に保存/アップロード？" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." -msgstr "" +msgstr "修正されたレイヤーをアップロード、保存中 ..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 @@ -6792,8 +6779,11 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" +"{0} レイヤーに未解決の競合があります。
最初に解決するか改変を無視し" +"てください。
競合のあるレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" -msgstr "" +#, fuzzy +msgid "Unsaved data and conflicts" +msgstr "競合を解決" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6807,7 +6797,10 @@ "html>" msgstr[0] "" +"{0} レイヤーは保存が必要ですが関連するファイルがありません。
このレ" +"イヤー用のファイルを選択するか変更を無視してください。
ファイルの無いレイ" +"ヤー:" #: ../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 "" @@ -6823,43 +6816,44 @@ "changes.
Layers with non-writable files:" msgstr[0] "" +"{0} レイヤーは保存が必要ですが
書き込み不可の
関連するファイルが" +"あります。
このレイヤー用の他のファイルを選択するか変更を無視してくださ" +"い。
書き込み不可のファイルのあるレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" -msgstr "" +msgstr "ダイアログを閉じてJOSMでの編集に戻る" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." -msgstr "" +msgstr "保存せずにJOSM を終了" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "変更を破棄して終了" +msgstr "破棄して削除" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." -msgstr "" +msgstr "保存せずにレイヤーを削除。未保存の変更は失われます。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." -msgstr "" +msgstr "保存せずにJOSM を終了。未保存の変更はアップロード、保存されます。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "保存して終了" +msgstr "保存と削除" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." -msgstr "" +msgstr "削除前に保存/アップロード。未保存の変更は失われます。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." -msgstr "" +msgstr "レイヤー ''{0}'' のアップロード準備中 ..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 @@ -6928,25 +6922,161 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "アップロード時" +msgstr "アップロードしますか？" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 msgid "Should save?" -msgstr "" +msgstr "保存しますか？" #: ../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 "一度のリクエストで全ての変更をアップロードしました。" + +#: ../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 "" +"一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリミ" +"ティブごとにリクエストするには、無効にする。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "アップロードする変更の概略コメントを入力してください。" + +#: ../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 "追加するオブジェクト:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "修正するオブジェクト:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "削除するオブジェクト:" + +#: ../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] "{0} 個のオブジェクトを加えてください:" + +#: ../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] "{0}個のオブジェクトを変更:" + +#: ../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] "{0} 個のオブジェクトを削除:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" + +#: ../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 "" +"選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを" +"閉じる" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "既存の変更セット {0} を使用し開いたままにしておく" + +#: ../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 "" +"選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために" +"変更セットを開いておく" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "変更セット {0} のタグ" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "変更のアップロード" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "ファイル" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "この変更をアップロードしますか?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "再読込" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "場所の名称を入力してください。" + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "更新をキャンセルしてダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 msgid "Preparing primitives to upload ..." -msgstr "" +msgstr "プリミティブアップロード準備中" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7175,5 +7305,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." @@ -7232,7 +7361,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "データをダウンロード中" +msgstr "データのダウンロード" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7297,4 +7425,14 @@ msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" + +#: ../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 "" +"マップデータとして加工されていないGPSデータをアップロードすることは、有" +"害だと考えられています。
もしトレースをアップロードしたいならば、ここを見" +"てください：" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7480,5 +7618,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 "削除する列を選択してください。" @@ -7946,7 +8084,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "選択リストにオブジェクトIDを表示" +msgstr "選択リストにローカライズされた名前を表示" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7961,7 +8098,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "選択リストにオブジェクトIDを表示" +msgstr "利用可能なら、選択リストにローカライズされた名前を表示" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -7989,5 +8125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36 msgid "Enable built-in icon defaults" -msgstr "" +msgstr "ビルトインアイコンのデフォルトを有効化" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 @@ -8025,5 +8161,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" -msgstr "" +msgstr "URL入力" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 @@ -8154,20 +8290,20 @@ #, java-format msgid "URL: {0}" -msgstr "" +msgstr "URL: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 #, java-format msgid "Author: {0}" -msgstr "" +msgstr "作者: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Webpage: {0}" -msgstr "" +msgstr "ウェブページ: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Version: {0}" -msgstr "" +msgstr "バージョン: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 @@ -8177,9 +8313,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293 msgid "Icon paths" -msgstr "" +msgstr "アイコンのパス" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" -msgstr "" +msgstr "デフォルトをコピー" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248 @@ -8194,5 +8330,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274 msgid "Add a new XML source to the list." -msgstr "" +msgstr "リストに新しいXML ソースを追加。" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275 @@ -8203,5 +8339,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281 msgid "Defaults (See tooltip for detailed information)" -msgstr "" +msgstr "デフォルト(詳細はツールチップ参照)" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38 @@ -8320,8 +8456,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!" @@ -8378,51 +8510,48 @@ 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 msgid "Remove old keys from up to {0} object" msgid_plural "Remove old keys from up to {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} オブジェクトまで古いキーを削除" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "新規レイヤーを追加" +msgstr "新しいタグを追加" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "選択したレイヤーの削除" - -#: ../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 "この機能の詳細情報" #. 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 "オプションの属性：" -#: ../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 "グループ \"{1}\"のプリセット\"{0}\"を使います" -#: ../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 "プリセット \"{0}\"を使います" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "閉じたウェイ" -#: ../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 "不明なタイプ: {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 @@ -8433,15 +8562,15 @@ msgstr "タグの事前設定ソース {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 "走査時にエラー: {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 "タイプ{0}の要素がサポートされます" -#: ../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 @@ -8450,18 +8579,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../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 "何も選択されていません！" -#: ../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 "プロパティを変更する" @@ -8488,5 +8617,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 "ヌルポインタ例外です。失われたタグがあるのでしょう。" @@ -8499,10 +8627,7 @@ #, java-format msgid "Could not export \"{0}\"" -msgstr "" +msgstr "\"{0}\" をエクスポートできません" #: ../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 @@ -8580,5 +8705,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}" @@ -8586,14 +8711,13 @@ #: ../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" -msgstr "" +msgstr "ファイル \"{0}\" はありません" #: ../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" -msgstr "" +msgstr "ファイル \"{0}\" の解析に失敗" #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 @@ -8604,5 +8728,5 @@ #, java-format msgid "Unknown mode {0}." -msgstr "" +msgstr "不明なモード {0}。" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 @@ -8610,7 +8734,9 @@ msgid "no primitive with id {0} in local dataset. Can't infer primitive type" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348 +"id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ" +"不明" + +#: ../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 @@ -8620,40 +8746,40 @@ msgstr "OSMデータをダウンロード中..." -#: ../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 +msgstr "id {0} のノードを ''{1}'' から取得中" + +#: ../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 +msgstr "id {0} のウェイを ''{1}'' から取得中" + +#: ../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 +msgstr "id {0} のリレーションを ''{1}'' から取得中" + +#: ../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 +msgstr "''{0}'' からノードのパッケージを取得中" + +#: ../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 -#, fuzzy, java-format +msgstr "''{0}'' からウェイのパッケージを取得中" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "''{0}'' からリレーションのパッケージを取得中" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8697,5 +8823,5 @@ #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" -msgstr "" +msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 @@ -8717,102 +8843,88 @@ msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../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 +msgstr "予期しない形式のID がサーバから返されました。 ''{0}'' を受け取りました" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +"変更されたプリミティブ ''{0}'' の新しいバージョンに予期しない形式、 ''{1}'' " +"を受け取りました" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "変更セットを開いています…" - -#: ../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}" -msgstr "" +msgstr "変更セット {0} を開きました" #: ../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 "変更セットを開いています…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "変更セットを開いています…" - -#: ../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 +msgstr "変更セット {0} は変更されていません。更新をスキップします。" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 +#, java-format msgid "Updating changeset {0}..." -msgstr "変更セットを開いています…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgstr "変更セット {0} を更新中..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "" "Failed to update changeset. Either there is no current changeset or the id " "of the current changeset is 0" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +"変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" +"セットのIDが 0 です。" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../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 "変更した設定を閉じています..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#, fuzzy, java-format +msgstr "変更セット {0} を閉じています..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#, java-format msgid "Leaving changeset {0} open..." -msgstr "変更セットを開いています…" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +msgstr "変更セット {0} を開いたままにします.." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372 msgid "No changeset present for diff upload" msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "アップロード中..." -#: ../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 +msgstr "10秒待機中 ... " + +#: ../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 +msgstr "OK - やり直しています。" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485 #, java-format msgid "Starting retry {0} of {1}." @@ -8823,20 +8935,20 @@ #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(コード={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "サーバがエラーを返しました。コード {0}" #: ../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 "" +msgstr "不正なbz2 ファイル。" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 @@ -8866,5 +8978,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 msgid "Login name (e-mail) to the OSM account." -msgstr "" +msgstr "OSM アカウントへのログイン名(e-mail)。" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244 @@ -8879,5 +8991,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" -msgstr "" +msgstr "OSM ユーザ名 (e-mail)" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 @@ -8891,7 +9003,15 @@ "URL.
Do not use a valuable Password." msgstr "" +"警告: パスワードは設定ファイルに平文で保管されています。
パスワード" +"はサーバに平文で、URLエンコードされて送信されます。
重要なパスワードは" +"使用しないでください。" + +#: ../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サーバファイル" @@ -8905,5 +9025,5 @@ #, java-format msgid "An error occurred while saving.
Error is:
{0}" -msgstr "" +msgstr "保存中にエラー発生。
エラー:
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 @@ -8913,12 +9033,14 @@ "html>" msgstr "" +"バックアップファイルのレストア中にエラー発生。
エラー:
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" -msgstr "" +msgstr "ファイルをバックアップできません。例外: {0}" #: ../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 "" @@ -8930,10 +9052,10 @@ #, java-format msgid "mandatory attribute ''{0}'' missing" -msgstr "" +msgstr "必須の属性 ''{0}'' がありません" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74 #, java-format msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''" -msgstr "" +msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77 @@ -8941,10 +9063,10 @@ msgid "" "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''" -msgstr "" +msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91 #, java-format msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" -msgstr "" +msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94 @@ -8952,5 +9074,5 @@ msgid "" "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" -msgstr "" +msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114 @@ -8958,5 +9080,5 @@ msgid "" "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''" -msgstr "" +msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174 @@ -8966,8 +9088,9 @@ "''{1}''" msgstr "" +"OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 msgid "Parsing OSM history data ..." -msgstr "" +msgstr "OSM 履歴データ解析中 ..." #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -8975,74 +9098,146 @@ msgstr "パース中にエラーが発生しています" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "バージョン番号は不明です" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "OSMデータにバージョン番号が欠けています。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "必須の属性 ''{0}'' がありません" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "必須の属性 ''{0}'' がありません" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "不明なバージョン: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "必須の属性 ''{0}'' がありません" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "ウエイ以外で要素が見つかりました" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " はゼロ参照です。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "要素がリレーション以外に見つかりました" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "" +"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし" +"た" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "リレーション {0}のメンバーに属性\"ref\"がかけています。" -#: ../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}." -msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" +"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし" +"た" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" +msgstr "リレーション {1} のメンバー {0} に属性 \"type\" がありません" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし" +"た" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "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 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" +msgstr "" +"ID {0} のOSM プリミティブの属性 \"version\"に不正な値 、 {1} を受け取りました" + +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "不明なバージョン: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" +msgstr "id {0} のOSM プリミティブに属性 \"version\" がありません" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "必要な属性\"{0}\"がありません" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#: ../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 "" @@ -9051,43 +9246,57 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, fuzzy, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "不明なリレーションメンバーのタイプ {0}" + #: ../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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "OSMデータを準備します…" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "III-形式のノードID" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "OSM 履歴データ解析中 ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "データを準備中..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 #, java-format msgid "id parameter ''{0}'' > 0 required. Got {1}" -msgstr "" +msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 #, java-format msgid "parameter ''{0}'' > 0 required. Got {1}" -msgstr "" +msgstr "パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 msgid "Downloading referring ways ..." -msgstr "" +msgstr "参照ウェイをダウンロード中" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 msgid "Downloading referring relations ..." -msgstr "" +msgstr "参照リレーションをダウンロード中" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" -msgstr "" +msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." -msgstr "" +msgstr "履歴をダウンロード中..." #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 @@ -9098,5 +9307,5 @@ #, java-format msgid "Failed to open connection to API {0}" -msgstr "" +msgstr "API {0} への接続に失敗しました" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 @@ -9105,33 +9314,43 @@ msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。" -#: ../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} 残っています. アップロード中 {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} 残っています. アップロード中 {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} 残っています. アップロード中 {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 "アップロード中..." + +#: ../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 "アップロードするものがありません。最初にデータを取得してください。" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9169,12 +9388,7 @@ msgstr "プラグイン {0} をダウンロードしています..." -#: ../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 "プラグイン {1} には JOSMのバージョン {0} が必要です。" +msgstr "ダウンロードをスキップ" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9184,5 +9398,10 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" -msgstr "" +msgstr "ダウンロードをスキップ" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -9195,4 +9414,6 @@ msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" +"{0} プラグインのロードが要求されました。このプラグインは今は必須ではありませ" +"ん。" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90 @@ -9228,20 +9449,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 "プラグイン {0} を読み込めません。設定から削除しますか？" -#: ../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 " @@ -9251,5 +9472,9 @@ "上書きできる権限があるかどうか、確認してください。" -#: ../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 "" @@ -9257,10 +9482,10 @@ msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。" -#: ../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 "このプラグインから得られる情報では、作者は {0} です。" -#: ../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." @@ -9269,9 +9494,9 @@ "い。" -#: ../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 " @@ -9281,13 +9506,13 @@ "再起動してください。" -#: ../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 +msgstr "プラグインは削除できませんでした。おそらく既に無効化されています" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 +msgstr "プラグイン情報" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -9311,5 +9536,5 @@ #, java-format msgid "Plug-in named {0} is not available. Update skipped." -msgstr "" +msgstr "{0} という名前のプラグインは利用できません。更新はスキップされました。" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93 @@ -9342,4 +9567,35 @@ "\n" "{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 "不明な" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9415,4 +9671,112 @@ msgstr "(テキストはクリップボードにコピーされています。)" +#: ../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 "" +"OSM サーバ {0} との通信の初期化に失敗しました。
設定のサーバURLとイ" +"ンターネット接続をチェックしてください。" + +#: ../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 "" +"OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。
" +"変更セットはタイムアウト後にサーバによって自動的に閉じられます。" + +#: ../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 "" +"サーバへのアップロードは失敗しました。 現在の
デー" +"タセットは前提条件に違反しています。
エラーメッセージ:
{0}" + +#: ../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 "" +"リモートサーバ
''{0}''
への接続にセキュリティ上の理由で接続を開け" +"ませんでした。おそらくアプレットを実行しているがアプレットを ''{1}' からロー" +"ドしていないためだと思われます。" + +#: ../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 "" +"リモートサーバ ''{0}' への接続が開けません。
インターネット接続を" +"チェックしてください。" + +#: ../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 "" +"データのアップロード先またはダウンロード元Failed to upload data to or " +"download data from
''{0}''
で、データ転送中に問題が発生したために処理が" +"失敗しました。
詳細(原文): {1}" + +#: ../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 "" +"OSM サーバ
''{0}''
からサーバの内部エラーの連絡がありました。
" +"おそらく一時的な問題です。後ほどやり直してみてください。" + +#: ../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 +#, fuzzy +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 "" +"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す" +"るか、planet.osm を使用して下さい。" + +#: ../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 "" +"リモートサーバ
''{0}''.
への接続を開けませんでした。ホスト名 " +"''{1}'' を解決できません。
設定のAPI URL とインターネット接続をチェックし" +"てください。" + +#: ../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 "" +"アップロード 失敗 サーバから削除しようとしたプリミティ" +"ブは既に削除されています。

エラーメッセージ:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9427,4 +9791,6 @@ "was: {1}" msgstr "" +"警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例" +"外: {1}" #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 @@ -9434,4 +9800,6 @@ "problem. JOSM will stop working." msgstr "" +"Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は" +"動作停止します。" #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 @@ -9473,5 +9841,5 @@ #, java-format msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" -msgstr "" +msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}" #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60 @@ -9482,6 +9850,7 @@ "was: {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +"警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9490,5 +9859,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9497,5 +9866,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9504,5 +9873,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9511,5 +9880,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9570,40 +9939,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 "" +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 +msgstr "タグ (カンマ区切り)" + +#: ../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}" @@ -9611,47 +9979,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 "GPXアップロードが成功しました。" -#: ../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 "GPSトラックをアップロード中：{0}% ({1} of {2})" -#: ../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 "GPXレイヤーが選ばれていません。トレースのアップロードはできません。" -#: ../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 "GPXトラックのアップロード" @@ -9871,5 +10239,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 "GPXトラックに画像を関連づけます。" @@ -9883,13 +10251,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 "GPXトラックを選択しなければなりません" -#: ../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 "GPXトラックの選択がありません" -#: ../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 "" @@ -9900,9 +10268,9 @@ "期待する形式: {0}" -#: ../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 "" @@ -9913,26 +10281,26 @@ "期待されるフォーマット: {0}" -#: ../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 "GPX トラック {2} に、{1}中に{0}枚発見しました。" -#: ../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 "GPXトラックが読み込まれました" -#: ../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." @@ -9941,39 +10309,39 @@ "してください。" -#: ../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 "GPXトラックは、時間情報を持っていません。" -#: ../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 "タイムゾーン: {0}" -#: ../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 "分: {0}" -#: ../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 "秒: {0}" -#: ../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 "{0}／{1} 枚の写真がGPXトラックにマッチしました。" -#: ../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 "(時差 {0} 日)" -#: ../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 "トラックと写真の間には、時差があります。: {0}分 {1}秒" -#: ../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 " @@ -9981,13 +10349,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 "デフォルトの値" @@ -10025,5 +10393,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 "ファイルの読み込みエラー" @@ -10052,11 +10420,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"市/町/村 {0} はWMSに見つからないか、入手不可能です。\n" -"入手可能かは、www.cadastre.gouv.fr で確認してください。" #. this below is a temporary workaround to fix the "always on top" issue @@ -10072,13 +10438,13 @@ msgstr "選択..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../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" @@ -10087,13 +10453,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 +msgstr "変更が実施されるようにJOSM を停止しました" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10204,9 +10570,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 "\"source=...\" を要素に追加しますか？" @@ -10257,9 +10623,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 msgid "Contacting cadastre WMS ..." -msgstr "" +msgstr "cadastre WMS に接続中 ..." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 msgid "Image already loaded" -msgstr "" +msgstr "画像は既にロードされています" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -10361,7 +10727,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "選択" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10421,5 +10786,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25 msgid "Export as PNG format (only raster images)" -msgstr "" +msgstr "PNG 形式でエクスポート(ラスター画像のみ)" #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 @@ -10446,5 +10811,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 "ブランクのレイヤー" @@ -10462,5 +10827,5 @@ #, java-format msgid "Raster size: {0}" -msgstr "" +msgstr "ラスターサイズ: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10529,9 +10894,9 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Split area" -msgstr "" +msgstr "エリア分割" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "タグ付けされていないウェイでエリアを分割" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -10541,12 +10906,14 @@ "Remove the area from the relation before splitting it." msgstr "" +"選択されたエリアは、いくつかのリレーションのメンバーなので分割できません。\n" +"分割の前にエリアをリレーションから削除してください。" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 msgid "TangoGPS Files (*.log)" -msgstr "" +msgstr "TangoGPS ファイル (*.log)" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Format errors: " -msgstr "" +msgstr "フォーマットエラー: " #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 @@ -10560,5 +10927,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "TCX ファイル (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -10906,5 +11273,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10 msgid "An unknown error has occurred" -msgstr "" +msgstr "不明なエラーが発生" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -11157,5 +11524,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsData.java:130 msgid "no name" -msgstr "" +msgstr "名前なし" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45 @@ -11290,8 +11657,11 @@ "new server? (Strongly recommended)" msgstr "" +"openstreetbus プラグインは appspot.com の古いサーバを使用しています。" +"
schokokeks.org の新しいサーバが利用できます。
新しいサーバに切り換えま" +"すか？ (強く推奨)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 msgid "Switch to new openstreetbugs server?" -msgstr "" +msgstr "新しいopenstreetbugs サーバに切り換えますか？" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51 @@ -11300,4 +11670,6 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" +"選択されたデータはOpenStreetBugs のデータを含んでいます。
このデータ" +"はアップロードできません。違うレイヤーを選択したようですね？" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -11325,5 +11697,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 msgid "Opens the OpenStreetBugs window and activates the automatic download" -msgstr "" +msgstr "OpenStreetBugs ウィンドウを開き、自動ダウンロードを有効化します" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125 @@ -11332,4 +11704,6 @@ "OpenStreetBugs" msgstr "" +"表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きす" +"ぎます" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50 @@ -11376,18 +11750,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 "Visibleを開く…" -#: ../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}" @@ -11398,5 +11772,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11406,9 +11780,9 @@ "を設定してください。" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarenderオプション" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefoxの実行ファイル" @@ -11419,28 +11793,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "新規ノードの作成" + +#: ../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 "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。" -#: ../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 " @@ -11451,9 +11830,9 @@ "会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。" -#: ../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 "" @@ -11461,20 +11840,29 @@ "求されました。" -#: ../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 "リクエストの詳細: {0}" -#: ../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 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "" +"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要" +"求されました。" + +#: ../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 "" @@ -11485,13 +11873,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "リレーションを編集" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "リレーションを編集" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "リレーションが選択されていません" #. Add menu @@ -11509,13 +11897,13 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73 msgid "Click to add destination." -msgstr "" +msgstr "クリックして目標を追加。" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88 msgid "Click and drag to move destination" -msgstr "" +msgstr "クリック＆ドラッグして目標を移動" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77 msgid "Click to remove destination" -msgstr "" +msgstr "クリックして目標を削除。" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68 @@ -11525,5 +11913,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" -msgstr "" +msgstr "ルーティングレイヤーを追加" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 @@ -11601,9 +11989,9 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" -msgstr "" +msgstr "タイルのキャッシュをフラッシュ" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "画像 " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -11687,5 +12075,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!" -msgstr "" +msgstr "SurveyorPlugin には LiveGpsPlugin が必要ですが見つかりません！" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46 @@ -11717,10 +12105,10 @@ #, java-format msgid "{0} start" -msgstr "" +msgstr "{0} 開始" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63 #, java-format msgid "{0} end" -msgstr "" +msgstr "{0} 終了" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 @@ -11746,6 +12134,5 @@ msgid "Updating properties of up to {0} object" msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} オブジェクトまでのプロパティを更新しています" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 @@ -11762,4 +12149,6 @@ "found." msgstr "" +"JOSM の予期しないバージョン。Main.ds も Main.getCurrentDataSet() も見つかりま" +"せん。" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -11785,5 +12174,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "予期しないカラム番号 {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -11918,5 +12307,5 @@ #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" +msgstr "\"{0}\" は閉じられていないので連結できません。" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149 @@ -11939,5 +12328,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." -msgstr "" +msgstr "交差点がみつかりません。何も変更されませんでした。" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 @@ -11947,5 +12336,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220 msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" +msgstr "内側のマルチポリゴンの一部ではないウェイを削除" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 @@ -11959,5 +12348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" -msgstr "" +msgstr "結合されたオーバーラップエリア" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235 @@ -11967,25 +12356,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "すべての競合に値を入力してください。" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "競合を解決する" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +msgstr "タグ競合を修正" + +#: ../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 "エリア結合機能" @@ -12058,6 +12455,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 "妥当性検証エラー" @@ -12067,10 +12464,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 "" @@ -12118,4 +12515,6 @@ "programs." msgstr "" +"OSM データ妥当性検証はユーザやエディタプログラムによる一般的なエラーをチェッ" +"クします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -12159,51 +12558,66 @@ 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 +#, fuzzy +msgid "Fixing errors ..." +msgstr "10秒待機中 ... " + +#: ../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 "変更セットを更新中..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12235,7 +12649,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "ビルの作成" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12243,39 +12656,35 @@ 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 -#, fuzzy +#: ../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 +msgstr "同位置のノード" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" -msgstr "" +msgstr "確認" #: ../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 "ウエイの複製" +msgstr "重複したウェイ" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "このテストは全く同じ位置にノードがないことをチェックします。" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "複製したウェイの作成" +msgstr "重複したウェイを削除" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12285,5 +12694,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." -msgstr "" +msgstr "全く同じ連続するノードを持つウェイをチェック" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 @@ -12309,4 +12718,6 @@ "than one way." msgstr "" +"このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないか" +"チェックします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105 @@ -12763,5 +13174,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "名前の無いジャンクション" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -12831,16 +13242,16 @@ #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 msgid "Select a starting node on the end of a way" -msgstr "" +msgstr "ウェイ終端の開始ノードを選択" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" -msgstr "" +msgstr "ラインの終端に到達" #. Three or more ways meeting at this node. Means we have a junction. #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +msgstr "ジャンクションに到達" + +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "例外が発生しました" @@ -12892,10 +13303,10 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 msgid "Download Rectified Images From Various Services" -msgstr "" +msgstr "様々なサービスから修正した画像をダウンロード" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" -msgstr "" +msgstr "WMS: {0}" #. This service serves the purpose of "just this once" without forcing the user @@ -12905,5 +13316,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 msgid "Custom WMS Link" -msgstr "" +msgstr "カスタムWMS リンク" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 @@ -12913,24 +13324,26 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" -msgstr "" +msgstr "ホームページはこちら" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" -msgstr "" +msgstr "WMS URL または画像ID:" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Add Rectified Image" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgstr "修正した画像を追加" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "" "Couldn't match the entered link or id to the selected service. Please try " "again." msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +"入力されたリンクまたはID を選択されたサービスにマッチさせることができませんで" +"した。もう一度試してください。" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201 msgid "No valid WMS URL or id" -msgstr "" +msgstr "正しいWMSまたはID がありません" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 @@ -12944,21 +13357,21 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +msgstr "調整するWMSレイヤーを選択してください。" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +msgstr "WMSレイヤを選択" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgstr "調整開始" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +msgstr "現在は調整するWMSレイヤーがありません。" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" -msgstr "" +msgstr "調整するレイヤーがありません" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 @@ -12968,4 +13381,6 @@ "or a trailing '?'." msgstr "" +"警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありませ" +"ん。" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 @@ -12973,10 +13388,10 @@ "Warning: Fetching WMS tiles is likely to fail. Please check you preference " "settings." -msgstr "" +msgstr "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 #, java-format msgid "Warning: The complete URL is ''{0}''." -msgstr "" +msgstr "警告: 完全なURL は ''{0}' です。" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 @@ -12994,22 +13409,21 @@ #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" -msgstr "" +msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "指定済み" - -#: ../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 "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード" -#: ../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 "WMS レイヤ ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13020,14 +13434,13 @@ 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 -#, fuzzy +msgstr "はい、画像を取得します" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "不正な日付" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "不正なURL？" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13035,101 +13448,113 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../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 "WMSレイヤーをファイルに保存" -#: ../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 +msgstr "WMS レイヤを保存" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../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 +msgstr "WMS レイヤをロード" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../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 "WMS" -#: ../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 "ファイルからデータをロードするためのブランクWMSレイヤを開く" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "WMSプラグイン設定" -#: ../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 "WMSプラグインメニューに表示されるWMS サーバのリストを変更" -#: ../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 "WMS URL" -#: ../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 "WMS URL (既定)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "メニュー名とWMS URLを入力" -#: ../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 "既定のコピー" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "重なった領域" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "少なくとも１つのウェイを選択してください。" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "北" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 msgid "WMS Files (*.wms)" -msgstr "" +msgstr "WMS ファイル (*.wms)" #. * @@ -13167,5 +13592,5 @@ #: build/specialmessages.java:10 msgid "Audio Device Unavailable" -msgstr "" +msgstr "オーディオ装置は使えません" #. Java message loading audio data @@ -13244,5 +13669,5 @@ #: build/trans_plugins.java:23 msgid "Visualizes routing information as a routing graph." -msgstr "" +msgstr "ルーティング情報をルーティンググラフとして可視化する。" #. Plugin grid @@ -13304,5 +13729,5 @@ msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" +msgstr "現在の表示スクリーンエリアに重なるgpx/osm ファイルのオープンを許可" #. Plugin osmarender @@ -13329,5 +13754,5 @@ #: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." -msgstr "" +msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる" #. Plugin routes @@ -13504,5 +13929,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 "道路番号" @@ -14044,7 +14469,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "シャレー風の別荘、シャレー" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14065,8 +14489,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 "レンタル" +msgstr "" #. color heath @@ -14084,5 +14507,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 "森" @@ -14095,7 +14519,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "パーキングチケット" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14131,7 +14554,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "敷石" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14142,7 +14564,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "不完全" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14153,7 +14574,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "草地" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14347,4 +14767,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" @@ -14373,12 +14794,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 @@ -14426,5 +14847,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14461,5 +14882,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14523,6 +14944,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 "いいえ" @@ -14668,6 +15090,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 "タイプ" @@ -14938,7 +15360,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "ペデストリアン・歩行者用市街道路" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14957,7 +15378,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "車止めのとげ" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15249,7 +15669,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 "操作員" @@ -15462,6 +15882,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 "高度" @@ -16376,7 +16796,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" @@ -16424,23 +16841,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 "営業時間" @@ -16464,5 +16881,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" @@ -16509,22 +16925,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 "" @@ -16539,22 +16955,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 "" @@ -16569,22 +16985,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 "" @@ -16618,5 +17034,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 "参照番号" @@ -16636,7 +17052,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "パーク＆ライド" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16650,7 +17065,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "収容台数" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16660,12 +17074,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "障がい者用スペース" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "障がい者用スペース" +msgstr "" #: build/trans_presets.java:1400 @@ -16867,5 +17279,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "避難所" @@ -17250,7 +17662,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "停止" +msgstr "" #. color tertiary @@ -17293,28 +17704,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "中国料理" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "エリアをダウンロードする" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "貼り付け" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "市区" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "郷土料理" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17342,7 +17748,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "山岳ハイキング" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17356,7 +17761,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "待避線" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17373,17 +17777,15 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "国境検査所" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "初心者" +msgstr "通知" #: build/trans_presets.java:1737 msgid "history" -msgstr "ヒストリー" +msgstr "履歴" #: build/trans_presets.java:1737 @@ -17396,40 +17798,34 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "土地利用" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "ガイドポスト(ハイキング)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "情報" +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 "シンボルの説明" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "音声" +msgstr "音声ガイド" #. #: build/trans_presets.java:1775 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "携帯電話経由の音声ガイド？" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" msgstr "電話番号" @@ -17755,5 +18151,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17787,5 +18183,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18912,6 +19308,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 "宗教" @@ -18920,66 +19316,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 "仏教" -#: 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 "キリスト教" -#: 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 "ヒンズー教" -#: 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 "ユダヤ教" -#: 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 "ムスリム" -#: 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 "シーク教" -#: 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 "降霊術士、イタコ" -#: 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 "道教" -#: 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 "ゾロアスター教" -#: 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 "宗派" @@ -18988,76 +19384,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 "英国教会系" -#: 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 "バプチスト" -#: 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 "カトリック" -#: 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 "福音派" -#: 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 "ものみの塔、エホバの証人" -#: 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 "ルター派" -#: 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 "メソジスト派" -#: 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 "モルモン" -#: 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 "ギリシャ正教系" -#: 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 "ペンテコステ派" -#: 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 "長老派" -#: 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 "プロテスタント" -#: 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 "クエーカー教徒" -#: 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 "シーア派" -#: 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 "スンニ派" @@ -19389,5 +19785,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 "備考" @@ -19412,5 +19808,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 "コイン" @@ -19418,5 +19814,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 "備考" @@ -19424,5 +19820,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 "電子マネー" @@ -19430,5 +19826,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 "デビットカード" @@ -19436,5 +19832,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 "クレジットカード" @@ -19493,10 +19889,144 @@ msgstr "ベンチ" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "戻る" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "記念碑(戦争記念などの)" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "なし" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "場所" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "色" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "戻る" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "下" + +#. 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 "緑" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "終了" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "値" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "水域(湖沼)" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "ワイヤー量" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Hunting Stand" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Hunting Standの編集" @@ -19505,30 +20035,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 "高さ" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "低い" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "半分" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "完全" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "隠す" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "ロック" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "噴水" @@ -19537,10 +20067,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "噴水の編集" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "飲料水" @@ -19549,10 +20079,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "飲料水の編集" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "赤ちゃんポスト" @@ -19560,35 +20090,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 "店舗" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "スーパーマーケット" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "スーパーマーケットの編集" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "シャレー風の別荘、シャレー" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "薬品屋" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "シャレー風の別荘の編集" - -#: build/trans_presets.java:2478 +msgstr "薬品屋の編集" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "コンビニエンスストア" @@ -19596,9 +20124,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "コンビニの編集" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "キオスク" @@ -19606,29 +20134,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "キオスクの編集" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "本屋" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "バス停の編集" - -#: build/trans_presets.java:2498 +msgstr "本屋を編集" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "旅行代理店" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "樹木・林の編集" - -#: build/trans_presets.java:2504 +msgstr "旅行代理店の編集" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "自動販売機" @@ -19636,5 +20162,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "自動販売機の編集" @@ -19642,88 +20168,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 "公共_交通_チケット" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "パーキングチケット" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "食料" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "甘味" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "たばこ" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "写真" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "ペットフード" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "新聞" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "おもちゃ" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "切手" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "携帯の契約" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "プリペイド携帯のチャージ" -#: 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 "コンドーム" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "タンポン" -#: 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 "精肉店" @@ -19731,9 +20257,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "精肉店の編集" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "パン屋" @@ -19741,9 +20267,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "パン屋の編集" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "生花店" @@ -19751,73 +20277,73 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "生花店の編集" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "オーガニック" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "オーガニック（有機）ショップの編集" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" -msgstr "" +msgstr "酒屋" #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" -msgstr "" - -#: build/trans_presets.java:2553 +msgstr "酒屋の編集" + +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "飲料店" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" -msgstr "" - -#: build/trans_presets.java:2559 +msgstr "酒屋(飲み物屋)の編集" + +#: build/trans_presets.java:2562 msgid "Computer" msgstr "コンピュータ店" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "コンピュータ店の編集" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "家電店" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "家電店の編集" -#: 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 "家具店" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "家具店の編集" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "園芸用品店" @@ -19825,9 +20351,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "園芸用品店の編集" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "金物屋" @@ -19835,9 +20361,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "金物屋の編集" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "DIYショップ" @@ -19845,54 +20371,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "DIYショップの編集" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "文具店" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "文具店の編集" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "美容院" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "美容院の編集" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "靴店" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "靴店の編集" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "おもちゃ屋" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "おもちゃ屋の編集" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "ビデオ" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "ビデオショップの編集" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "クリーニング店" @@ -19900,9 +20426,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "クリーニング店の編集" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "ランドリー" @@ -19910,9 +20436,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "ランドリーの編集" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "アウトドア店" @@ -19920,32 +20446,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "アウトドア店の編集" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" -msgstr "" - -#. item -#: build/trans_presets.java:2656 +msgstr "スポーツ" + +#. item +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "スポーツ店" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" -msgstr "" - -#. item -#: build/trans_presets.java:2662 +msgstr "メガネ屋" + +#. item +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "眼鏡屋の編集" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "お金" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "銀行" @@ -19953,14 +20479,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "銀行の編集" -#: 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 "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "両替" @@ -19968,5 +20494,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "両替の編集" @@ -19974,15 +20500,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "ATMの編集" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "医院" @@ -19990,18 +20516,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "医院の編集" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "歯科医院" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "歯科医院の編集" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "薬局" @@ -20009,5 +20535,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "薬局の編集" @@ -20015,9 +20541,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "調剤薬局" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "病院" @@ -20025,10 +20551,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "病院の編集" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "夜間急病センター" @@ -20037,5 +20563,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "夜間急病センターの編集" @@ -20044,20 +20570,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "ポイント数" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "ポイント名" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "電話番号" #. 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 "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)" @@ -20065,5 +20591,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 "動物病院" @@ -20072,55 +20598,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "動物病院の編集" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "大陸" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "大陸の編集" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "国(country)" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "国(country)の編集" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "州(state)" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "州(state)の編集" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "地方" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "地方の編集" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "郡" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "郡の編集" @@ -20128,15 +20654,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "市区" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "市区の編集" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "町" @@ -20144,10 +20670,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "町の編集" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "近郊住宅地" @@ -20155,25 +20681,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "近郊住宅地の編集" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "村" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "村の編集" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "小村落" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "小村落の編集" @@ -20181,5 +20707,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "地域" @@ -20187,10 +20713,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "地域の編集" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "島" @@ -20198,24 +20724,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "島の編集" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "左" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "シャレー風の別荘の編集" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "洞窟の入口" @@ -20223,10 +20747,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "洞窟の入口の編集" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "山頂" @@ -20234,10 +20758,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "山頂の編集" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "氷河" @@ -20245,10 +20769,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "氷河の編集" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "火山" @@ -20256,70 +20780,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "火山の編集" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "境界線" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "国境" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "国境の編集" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "行政区画" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "行政区画の編集" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civil境界" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Civil境界の編集" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "地点名" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Political境界の編集" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "国立公園" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "国立公園の境界編集" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "樹木・林" @@ -20328,15 +20852,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "樹木・林の編集" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "植物の名前" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "森" @@ -20345,5 +20869,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "森の編集" @@ -20351,17 +20875,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 "針葉樹" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "広葉樹" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "混合林" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "森" @@ -20370,14 +20894,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "森の編集" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "自然保護区" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "自然保護区の編集" @@ -20385,25 +20909,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "ガレ場" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "ガレ場の編集" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "低木林" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "低木林の編集" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "山(Fell)" @@ -20411,10 +20935,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "山(Fell)の編集" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "荒れ地" @@ -20422,5 +20946,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "荒れ地の編集" @@ -20428,5 +20952,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "農家の庭" @@ -20435,45 +20959,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "農家の庭の編集" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "農地" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "農地の編集" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "牧草地" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "牧草地の編集" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "ぶどう園" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "ぶどう園の土地利用の編集" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "貸し農園" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "家庭菜園用地の編集" @@ -20481,25 +21005,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "庭園" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "庭園の編集" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "草地" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "草地の編集" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "里山" @@ -20507,10 +21031,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "里山利用区画の編集" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "共有地" @@ -20518,20 +21042,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "共有地の名前" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "公園" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "公園の編集" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "レクレーション広場" @@ -20539,5 +21063,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "レクレーション広場利用区画の編集" @@ -20545,15 +21069,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "住宅エリア" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "住宅用地の編集" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "墓所" @@ -20561,9 +21085,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "（教会・寺院にある）墓所の編集" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "共同墓地" @@ -20571,39 +21095,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "共同墓地の編集" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "小売り商業" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "小売商用地の編集" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "商用" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "商用地の編集" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "工業" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "工業地の編集" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "鉄道用地" @@ -20611,15 +21135,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "鉄道用地の編集" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "軍用" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "軍用地の編集" @@ -20627,55 +21151,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "工事中エリア" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "工事中用地の編集" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "利用されなくなった商業設備" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "利用されなくなった工業地の編集" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "未開発工業地" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "緑地の編集" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "埋め立てゴミ処理地" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "埋め立てゴミ処理地の編集" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "採石場" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "採石場の編集" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "マルチポリゴン" @@ -20685,5 +21209,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 "マルチポリゴンを編集" @@ -20692,10 +21216,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "外側のセグメント" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "内側のセグメント" @@ -20703,5 +21227,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "右左折制限" @@ -20710,5 +21234,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "右左折制限の編集" @@ -20716,34 +21240,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "通行制限" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "左折禁止" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "右折禁止" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "直進禁止" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "Uターン禁止" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "右折のみ" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "左折のみ" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "直進のみ" @@ -20752,15 +21276,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "ウエイから" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "ノードかウェイを経由して" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "ウエイへ" @@ -20768,5 +21292,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "ルート" @@ -20775,5 +21299,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "ルート編集" @@ -20781,5 +21305,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "ルート種類" @@ -20787,5 +21311,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20851,5 +21375,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 @@ -20858,17 +21382,17 @@ msgstr "自転車" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "バス" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "道" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "フェリー" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "スキー" @@ -20921,5 +21445,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 @@ -20928,13 +21452,13 @@ msgstr "徒歩" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "ハイキング" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "トラム" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "迂回路" @@ -20948,10 +21472,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "地下鉄" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "シンボルの説明" @@ -20959,31 +21483,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "ネットワーク" #. 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 "案" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "代替路" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "一時的" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "接続" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "色 (16進法)" @@ -20992,30 +21516,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "ルートセグメント" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "前のセグメント" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "後方セグメント" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "停止点" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "前方の停止点" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "後方の停止点" @@ -21721,5 +22245,5 @@ #: build/trans_style.java:484 build/trans_style.java:485 msgid "barrier" -msgstr "" +msgstr "バリア" #. color barrier @@ -21922,5 +22446,5 @@ #: build/trans_style.java:839 msgid "services" -msgstr "" +msgstr "サービス" #. color services @@ -21934,5 +22458,5 @@ #: build/trans_style.java:847 msgid "ford" -msgstr "" +msgstr "浅瀬（洗い越し）" #. color ford @@ -24168,76 +24692,4 @@ msgstr "史跡" -#. 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 "緑" - #. color green #. @@ -25205,63 +25657,64 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "ウェイが全て空です。" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "異なったメンバーになっているノードを結合しますか？" + +#~ msgid "Merge Anyway" +#~ msgstr "強制的に結合" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" -#~ "す。" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "ほぼ垂直になっているウェイを選択してください。" +#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." #~ msgstr "" -#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" -#~ "してください。" - -#~ msgid "No document open so nothing to save." -#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" - -#~ msgid "Delete {1} {0}" -#~ msgstr "削除 {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "情報ディレクトリを読み取れません: {0}" - -#~ msgid "Delete Layer" -#~ msgstr "レイヤー削除" - -#~ msgid "Authors: {0}" -#~ msgstr "作者: {0}" - -#~ msgid "Public" -#~ msgstr "公開" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" - -#~ msgid "Continue anyway" -#~ msgstr "とりあえず続ける" - -#~ msgid "Edit Information Office" -#~ msgstr "案内所の編集" - -#~ msgid "Map Type" -#~ msgstr "マップタイプ" - -#~ msgid "map" -#~ msgstr "マップ" - -#~ msgid "citymap" -#~ msgstr "街路地図" - -#~ msgid "hikingmap" -#~ msgstr "ハイキングマップ" - -#~ msgid "bicyclemap" -#~ msgstr "自転車マップ" - -#~ msgid "board" -#~ msgstr "board" +#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" + +#~ msgid "Reusing existing changeset {0}" +#~ msgstr "既存の変更セット {0} を再利用しています" + +#~ msgid "Unknown version" +#~ msgstr "バージョン番号は不明です" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "OSMデータにバージョン番号が欠けています。" + +#~ msgid "Found element in non-way." +#~ msgstr "ウエイ以外で要素が見つかりました" + +#~ msgid " has zero ref" +#~ msgstr " はゼロ参照です。" + +#~ msgid "Found element in non-relation." +#~ msgstr "要素がリレーション以外に見つかりました" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "" +#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" +#~ "た。" + +#~ msgid "Ill-formed node id" +#~ msgstr "III-形式のノードID" #~ msgid "Move" @@ -25322,4 +25775,9 @@ #~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" +#~ "す。" + #~ msgid "Revert" #~ msgstr "取り消す" @@ -25330,4 +25788,7 @@ #~ msgid "Contacting the OSM server..." #~ msgstr "OSMサーバに接続…" + +#~ msgid "Authors: {0}" +#~ msgstr "作者: {0}" #~ msgid "Login name (email) to the OSM account." @@ -25359,4 +25820,7 @@ #~ msgstr "更新" +#~ msgid "Delete {1} {0}" +#~ msgstr "削除 {1} {0}" + #~ msgid "true" #~ msgstr "真" @@ -25371,4 +25835,7 @@ #~ msgstr "差異" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "情報ディレクトリを読み取れません: {0}" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -25383,9 +25850,9 @@ #~ msgstr "TCXファイルをインポート" -#~ msgid "end" -#~ msgstr "終了" - #~ msgid "Select Tableau d'Assemblage" #~ msgstr "Tableau d'Assemblageを選択" + +#~ msgid "Public" +#~ msgstr "公開" #~ msgid "Navigation" @@ -25408,4 +25875,16 @@ #~ msgid "Portcullis" #~ msgstr "城の格子戸" + +#~ msgid "map" +#~ msgstr "マップ" + +#~ msgid "citymap" +#~ msgstr "街路地図" + +#~ msgid "hikingmap" +#~ msgstr "ハイキングマップ" + +#~ msgid "bicyclemap" +#~ msgstr "自転車マップ" #~ msgid "sports" @@ -25463,4 +25942,7 @@ #~ msgid "Adjust the position of the WMS layer" #~ msgstr "WMSレイヤーの位置を調整" + +#~ msgid "board" +#~ msgstr "board" #~ msgid "Add Selected" @@ -25502,4 +25984,7 @@ #~ "本メッセージ後は、データのアップロードはやめてください。" +#~ msgid "No document open so nothing to save." +#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" + #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -25524,4 +26009,7 @@ #~ "した状態で移動させる。選択：クリック。" +#~ msgid "Delete Layer" +#~ msgstr "レイヤー削除" + #~ msgid "Occupied By" #~ msgstr "次によって占められる;" @@ -25570,4 +26058,14 @@ #~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" +#~ "してください。" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "ほぼ垂直になっているウェイを選択してください。" + +#~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " #~ "elements have a history." @@ -25603,4 +26101,7 @@ #~ msgstr "投影法が無効" +#~ msgid "Continue anyway" +#~ msgstr "とりあえず続ける" + #~ msgid "Change the projection to {0} first." #~ msgstr "最初に投影法を {0} に変えてください。" @@ -25615,4 +26116,10 @@ #~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" #~ "ダーを調整して、手動で写真に合わせることができます。" + +#~ msgid "Map Type" +#~ msgstr "マップタイプ" + +#~ msgid "Edit Information Office" +#~ msgstr "案内所の編集" #~ msgid "Remove route nodes" @@ -25661,2 +26168,5 @@ #~ msgid "Cannot read numeric value from response" #~ msgstr "応答から数値を読み取れません。" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 17594) +++ /applications/editors/josm/i18n/po/nb.po (revision 17595) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" "PO-Revision-Date: 2009-08-15 13:39+0000\n" "Last-Translator: Dirk Stöcker \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:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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 "Hjelp" -#: ../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 "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../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 "Feil" -#: ../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] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" -msgstr[1] "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Ulagrede endringer" -#: ../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 "Lagre og avslutt" -#: ../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 "Forkast og avslutt" -#: ../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 "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{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 "Advarsel" -#: ../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 "Overser feilutformet fil-URL: «{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 "Programtillegg" @@ -352,20 +354,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " -"riktig til historikkside for OSM-element. API-URL er «{0}»." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " -"riktig til historikkside for OSM-element. API-URL er «{0}»." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -473,9 +471,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 @@ -509,6 +507,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 @@ -527,11 +525,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 "Informasjon" @@ -553,5 +551,5 @@ msgstr "Velg minst 3 noder" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -562,10 +560,10 @@ "er {0}, maksimalt er {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-krav ikke møtt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -575,5 +573,5 @@ "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -584,9 +582,9 @@ "lengde {2}. Verdiens lengde er {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Forhåndsbetingelse brutt" -#: ../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}" @@ -641,26 +639,22 @@ msgstr "Ingen konflikter å vise." -#: ../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 "Sammenføy linjer" -#: ../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 "Sammenføy flere linjer til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Velg minst to linjer å sammenføye." - -#: ../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 "Sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Sammenføy uansett" -#: ../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 " @@ -668,13 +662,13 @@ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Endre retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Snu og sammenføy" -#: ../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 " @@ -684,30 +678,18 @@ "retningen på noen av linjene?" -#: ../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 "Legg inn verdier for alle konflikter." - -#: ../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 "Løs konflikter" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Sammenføy {0} linjer" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Alle linjene var tomme" - -#: ../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 "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Sammenføy {0} linjer" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Velg minst to linjer å sammenføye." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -763,5 +745,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 "Slett" @@ -771,15 +753,15 @@ msgstr "Slett valgte objekter." -#: ../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 "Skriv over" -#: ../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 "Filen finnes. Vil du overskrive filen?" @@ -808,10 +790,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}" @@ -842,5 +824,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 @@ -883,7 +865,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Alle bilder" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1020,1051 +1001,25 @@ msgstr "Flett det gjeldende laget inn i et annet lag" -#: ../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 "Samle noder" -#: ../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 "Samle noder i den eldste" -#: ../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 "Velg minst to noder til å samle" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Samle noder med forskjellige relasjoner?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Samle noder allikevel" - -#: ../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 "" -"De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " -"samle noder?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Samle {0} noder" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Flett utvalgte" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Speilvend" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Speilvend valgte noder og linjer" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Velg minst én node eller linje." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "opp" - -#: ../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 "Flytt objektene {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "ned" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "venstre" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "høyre" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Flytt {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Flytter Objekter {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 "Kan ikke flytte objekter utenfor kartet." - -#: ../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 "Ny" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Lag et nytt kart." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Åpne …" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Åpne en fil." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Åpne en fil." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Ukjent rolle «{0}»." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Åpne sted …" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Åpne en URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separat lag" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Oppgi URL for nedlasting:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Last ned sted" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Last ned URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Vinkle Form" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Bare to noder tillatt" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Du kan bare velge linjer." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Velg en eller flere lukkede linjer med minst fire noder." - -#: ../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 "Bare én node er valgt" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Vinkle (90)" - -#: ../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 "Lim inn" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Lim inn fra utklippstavla." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Lim inn egenskaper" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Bruk egenskaper i utklippstavla på alle valgte element." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Laster {0}" -msgstr[1] "Laster {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Gjenopprett {0} objekter" -msgstr[1] "Gjenopprett {0} objekter" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Innstillinger …" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Åpne side med globale innstillinger." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Innstillinger" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Gjør om" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Gjør om siste angrede handling." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Endre navn på lag" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Gi nytt navn på fil også" - -#: ../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 "Snu retning på linjer" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Snu retning på alle valgte linjer" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Velg minst én linje" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Snu retning på linjer" - -#: ../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 "Lagre" - -#: ../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 "Lagre gjeldende data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Filen {0} finnes allerede. Vil du skrive over den?" - -#: ../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 "Tomt dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokumentet er tomt." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Lagre uansett" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikter" - -#: ../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 "" -"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil " -"du fortsette?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Avvis konflikter og lagre" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Lagre OSM-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Lagre GPX-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Lagre lag" - -#: ../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 "Lagre som …" - -#: ../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 "Lagre aktive data i ny fil." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Velg alt" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Vis statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "Vis statusrapport med informasjon for feilsøking" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Hjelp: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopier til utklippstavlen og lukk" - -#: ../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 "Lukk" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Splitt linje" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Splitt en linje i den valgte noden." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Kan ikke splitte med dette utvalget" - -#: ../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] "Valgt node er ikke del av en linje." -msgstr[1] "Valgte noder er ikke del av en linje." - -#: ../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] "Mer enn én linje bruker den valgte noden. Velg flere linjer." -msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Valgte noder er ikke på samme linje." - -#: ../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] "Valgt linje inneholder ikke valgt node." -msgstr[1] "Valgt linje inneholder ikke de valgte nodene." - -#: ../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 "Velg to eller fler noder for å splitte sirkelformet linje." - -#: ../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 "" -"Linje kan ikke splittes i valgt node. (Tips: velg noder mot midten av " -"linjen.)" - -#: ../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 "Splitt linje {0} i {1} deler" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Lukker endringssett …" - -#: ../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 "Lukker endringssett …" - -#: ../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 "Åpner endringssett …" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Lukker endringssett …" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Slå av/på GPX-linjer" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Trekk linjer mellom GPS-punkt." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Slår av/på global innstilling «{0}»." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Fjern knytning til linjer" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Dupliser noder som er med i flere linjer." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Denne noden har ikke knytninger" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ingen av disse nodene har knytninger." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ingen noder i denne linjen har andre knytninger." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Valgte element har ikke knytninger som kan løses." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Velg:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* En node med egenskaper, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "– En node som brukes av flere linjer, eller" - -#: ../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 "– En node som er brukt av flere linjer, og en av linjene, eller" - -#: ../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 "" -"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" - -#: ../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 "– En linje, og en eller flere av nodene som er brukt i flere linjer." - -#: ../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 "" -"Merk: Når du velger en linje, vil denne få nye kopier av noder uten\n" -"tilknytninger og nodene bli valgt. Ellers vil alle linjer få egne\n" -"kopier og alle noder bli valgt." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Node uten tilknytning" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Kopier til {0} noder" - -#. 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 "Kopier {0} noder til {1} noder" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Angre" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Angre siste handling." - -#: ../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øm utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Fjern alle objekter fra utvalg." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Tøm utvalg (Fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Tøm utvalg (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Oppdater data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)" - -#. 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 "" - -#: ../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 "Oppdater utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Oppdaterer de valgte objektene fra tjeneren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Det er ingen valgte objekter å oppdatere" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Utvalget er tomt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Last opp til OSM …" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Last opp alle endringer til OSM-tjeneren." - -#: ../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 "Data inneholder uløste konflikter som først må løses." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Ingen endringer å laste opp. Finn frem data først." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Ingen endringer å laste opp." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synkroniser kun {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 "Synkroniser hele datasettet" - -#: ../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 "" -"Upplasting feilet fordi tjeneren har en nyere versjon " -"av en
lokal node, linje eller relasjon.
Konflikten er forårsaket av " -"{0} med ID {1},
tjeneren har versjon " -"{2}, lokal versjon er {3}.

Trykk {4} for å " -"synkronisere kun konfliktelementet.
Trykk {5} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Konflikt oppdaget" - -#. 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 "Uventet returverdi. Mottok {0}." - -#: ../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 "" -"Opplasting feilet fordi tjeneren har en nyere versjon " -"av en node, linje ellerrelasjon.

Trykk {0} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Opplasting feilet.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Klarte ikke laste opp til OSM-API" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Oppdaterer objekt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Laste opp disse endringene?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Last opp endringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Rediger ny relasjon i lag \"{0}\"" - -#: ../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 "Legg til en node i eksisterende linje" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Gi en kort kommentar for endringene du laster opp:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Innstillinger for kart" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "endringssett" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objekter som legges til:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objekter som endres:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objekter som slettes:" - -#: ../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] "Objekter som legges til:" -msgstr[1] "Objekter som legges til:" - -#: ../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] "Objekter som endres:" -msgstr[1] "Objekter som endres:" - -#: ../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] "Objekter som slettes:" -msgstr[1] "Objekter som slettes:" - -#: ../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 "Siste endring på {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Zoom inn" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zoom ut" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Tilbake" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Hopp tilbake." - -#: ../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 "Raskere" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Rask Avspilling" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Spill av" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Neste spor" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Neste merke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Spill fra neste merke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Spill/Pause" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Spill/Pause audio." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Forrige merke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Spill av forrige merke" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Saktere" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Spill av sakte" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Laster ned GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Laster ned GPX-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "GPS-rådata" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Laster ned data" - -#: ../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 "Ingenting er importert." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Last ned {0} av {1} ({2} gjenstår)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Feil under nedlasting" - -#: ../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 "" -"Det er {0} elementer i det lokale datasettet som
kan være slettet " -"på tjeneren. Hvis du senere prøver å slette
eller oppdatere dem, vil " -"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk {1}" -" for å sjekke status for disse elementene
på tjeneren.
Trykk " -"{2} for å ignorere.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Slettede eller flyttede objekter" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Slettemodus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Slett noder eller linjer." - -#: ../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 "Modus: {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 "" -"Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte noder " -"når linjer slettes. Ctrl: slett objekt med referanse." - +#: ../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 @@ -2075,7 +1030,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 @@ -2084,6 +1040,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 @@ -2114,4 +1070,894 @@ msgstr "parameter «{0}» må ha en verdi" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Samle {0} noder" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Flett utvalgte" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Speilvend" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Speilvend valgte noder og linjer" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Velg minst én node eller linje." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "opp" + +#: ../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 "Flytt objektene {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "ned" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "venstre" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "høyre" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Flytt {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Flytter Objekter {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 "Kan ikke flytte objekter utenfor kartet." + +#: ../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 "Ny" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Lag et nytt kart." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Åpne …" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Åpne en fil." + +#: ../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 "Åpne sted …" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Åpne en URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separat lag" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Oppgi URL for nedlasting:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Last ned sted" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Last ned URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Vinkle Form" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Bare to noder tillatt" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Du kan bare velge linjer." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Velg en eller flere lukkede linjer med minst fire noder." + +#: ../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 "Bare én node er valgt" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Vinkle (90)" + +#: ../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 "Lim inn" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Lim inn fra utklippstavla." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Lim inn egenskaper" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Bruk egenskaper i utklippstavla på alle valgte element." + +#: ../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 "Innstillinger …" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Åpne side med globale innstillinger." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Innstillinger" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Gjør om" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Gjør om siste angrede handling." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Endre navn på lag" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Gi nytt navn på fil også" + +#: ../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 "Snu retning på linjer" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Snu retning på alle valgte linjer" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Velg minst én linje" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Snu retning på linjer" + +#: ../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 "Lagre" + +#: ../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 "Lagre gjeldende data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Filen {0} finnes allerede. Vil du skrive over den?" + +#: ../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 "Tomt dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Lagre uansett" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokumentet er tomt." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Avvis konflikter og lagre" + +#: ../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 "" +"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil " +"du fortsette?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Lagre OSM-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Lagre GPX-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Lagre lag" + +#: ../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 "Lagre som …" + +#: ../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 "Lagre aktive data i ny fil." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Velg alt" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Vis statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "Vis statusrapport med informasjon for feilsøking" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hjelp: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopier til utklippstavlen og lukk" + +#: ../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 "Lukk" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Splitt linje" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Splitt en linje i den valgte noden." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Kan ikke splitte med dette utvalget" + +#: ../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] "Valgt node er ikke del av en linje." +msgstr[1] "Valgte noder er ikke del av en linje." + +#: ../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] "Mer enn én linje bruker den valgte noden. Velg flere linjer." +msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Valgte noder er ikke på samme linje." + +#: ../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] "Valgt linje inneholder ikke valgt node." +msgstr[1] "Valgt linje inneholder ikke de valgte nodene." + +#: ../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 "Velg to eller fler noder for å splitte sirkelformet linje." + +#: ../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 "" +"Linje kan ikke splittes i valgt node. (Tips: velg noder mot midten av " +"linjen.)" + +#: ../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 "Splitt linje {0} i {1} deler" + +#: ../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 "Slå av/på GPX-linjer" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Trekk linjer mellom GPS-punkt." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Slår av/på global innstilling «{0}»." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Fjern knytning til linjer" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Dupliser noder som er med i flere linjer." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Denne noden har ikke knytninger" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ingen av disse nodene har knytninger." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ingen noder i denne linjen har andre knytninger." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Valgte element har ikke knytninger som kan løses." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Velg:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* En node med egenskaper, eller" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "– En node som brukes av flere linjer, eller" + +#: ../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 "– En node som er brukt av flere linjer, og en av linjene, eller" + +#: ../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 "" +"– En linje som har en eller flere noder, som er brukt av flere linjer, eller" + +#: ../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 "– En linje, og en eller flere av nodene som er brukt i flere linjer." + +#: ../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 "" +"Merk: Når du velger en linje, vil denne få nye kopier av noder uten\n" +"tilknytninger og nodene bli valgt. Ellers vil alle linjer få egne\n" +"kopier og alle noder bli valgt." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Node uten tilknytning" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Kopier til {0} noder" + +#. 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 "Kopier {0} noder til {1} noder" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Angre" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Angre siste handling." + +#: ../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øm utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Fjern alle objekter fra utvalg." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Tøm utvalg (Fokus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Tøm utvalg (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Oppdater data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)" + +#. 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 "" + +#: ../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 "Oppdater utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Oppdaterer de valgte objektene fra tjeneren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Det er ingen valgte objekter å oppdatere" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Utvalget er tomt" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Last opp til OSM …" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Last opp alle endringer til OSM-tjeneren." + +#: ../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 "Ingen endringer å laste opp. Finn frem data først." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Ingen endringer å laste opp." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synkroniser kun {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 "Synkroniser hele datasettet" + +#: ../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 "" +"Upplasting feilet fordi tjeneren har en nyere versjon " +"av en
lokal node, linje eller relasjon.
Konflikten er forårsaket av " +"{0} med ID {1},
tjeneren har versjon " +"{2}, lokal versjon er {3}.

Trykk {4} for å " +"synkronisere kun konfliktelementet.
Trykk {5} for å " +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Konflikt oppdaget" + +#. 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 "Uventet returverdi. Mottok {0}." + +#: ../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 "" +"Opplasting feilet fordi tjeneren har en nyere versjon " +"av en node, linje ellerrelasjon.

Trykk {0} for å " +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Opplasting feilet.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Klarte ikke laste opp til OSM-API" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Oppdaterer objekt" + +#: ../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 "Zoom inn" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zoom ut" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Tilbake" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Hopp tilbake." + +#: ../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 "Raskere" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Rask Avspilling" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Spill av" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Neste spor" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Neste merke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Spill fra neste merke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Spill/Pause" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Spill/Pause audio." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Forrige merke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Spill av forrige merke" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Saktere" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Spill av sakte" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Laster ned GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Laster ned GPX-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "GPS-rådata" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Laster ned data" + +#: ../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 "Ingenting er importert." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Last ned {0} av {1} ({2} gjenstår)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Feil under nedlasting" + +#: ../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 "" +"Det er {0} elementer i det lokale datasettet som
kan være slettet " +"på tjeneren. Hvis du senere prøver å slette
eller oppdatere dem, vil " +"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk {1}" +" for å sjekke status for disse elementene
på tjeneren.
Trykk " +"{2} for å ignorere.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Slettede eller flyttede objekter" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Slettemodus" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Slett noder eller linjer." + +#: ../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 "Modus: {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 "" +"Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte noder " +"når linjer slettes. Ctrl: slett objekt med referanse." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2226,18 +2072,18 @@ "+slipp synkroniserer audio i dette punktet." -#: ../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 "Velg" -#: ../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 "Velg, flytt og roter objekt" -#: ../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" @@ -2246,18 +2092,18 @@ msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Flytt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Flytt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Angre flytting" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2265,8 +2111,6 @@ "Really move them?" msgstr "" -"Du flyttet mere enn {0} elementer. Flytting av et stort antall elementer er " -"ofte en feil." - -#: ../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 "" @@ -2390,7 +2234,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:… – objekt med angitt ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2445,41 +2288,41 @@ msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Start søk" -#: ../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 "Fant ingen treff for «{0}»" -#: ../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 "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../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 "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../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 "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2492,41 +2335,41 @@ "{2}" -#: ../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 "" "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java: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 "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../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 "Uventet symbol: {0}" -#: ../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 "OR mangler argument." -#: ../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 "NOT mangler argument." -#: ../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 "Forventer parentes slutt." -#: ../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 "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2537,5 +2380,5 @@ "intervall, for eksempel nodes:10-20" -#: ../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." @@ -2572,62 +2415,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Legg til node" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Legg til {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relasjoner: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Endre {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Endre {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Skift relasjon" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Fjern «{0}» i {1} «{2}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Fjern «{0}» i {1} «{2}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Fjern «{0}» i {1} «{2}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Sett {0}={1} i {2} «{3}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Sett {0}={1} i {2} «{3}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Sett {0}={1} i {2} «{3}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2699,30 +2542,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] "Slett {0} {1}" -msgstr[1] "Slett {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] "Slettemodus" -msgstr[1] "Slettemodus" +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] "Slett {0} {1}" -msgstr[1] "Slett {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] "Slett fra relasjon" -msgstr[1] "Slett fra relasjon" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2736,20 +2579,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n" -"Vil du slette utvalget fra relasjonen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Utvalg «{0}» brukes av relasjon «{1}».\n" -"Vil du slette utvalget fra relasjonen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2760,5 +2599,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." @@ -2841,17 +2680,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Løs {0} egenskapskonflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Løs {0} egenskapskonflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Løs {0} egenskapskonflikter i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2861,17 +2700,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Løs versjonskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Løs versjonskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Løs versjonskonflikter for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2961,11 +2800,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." msgstr "" -"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i " -"historikken." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3011,9 +2848,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3080,5 +2917,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 @@ -3086,22 +2923,47 @@ 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 "parameter {0} > 0 nødvendig. Leste {1}." -#: ../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 "parameter «{0}» må ha en verdi" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Feil: {0}" -#: ../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 "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "Uventet kolonneindeks: {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Uventet symbol: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Uventet symbol: {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3115,11 +2977,16 @@ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»" -#: ../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 "" @@ -3170,9 +3037,9 @@ msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" -#: ../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 "Linje for areal er ikke lukket." -#: ../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." @@ -3181,118 +3048,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 "Tomt medlem i relasjon." -#: ../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 "Slettet medlem «{0}» i relasjon." -#: ../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 "Linje «{0}» med færre enn to punkter." -#: ../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 "Fant mer enn én linje med «from»." -#: ../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 "Fant mer enn én linje med «to»." -#: ../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 "Fant mer enn én \"via\"." -#: ../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 "Ukjent rolle «{0}»." -#: ../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 "Ukjent medlemstype for «{0}»." -#: ../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 "Fant ingen linje med «from»." -#: ../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 "Fant ingen linje med «to»." -#: ../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 "Fant ingen node eller linje med «via»." -#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-node." -#: ../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 "Linje med \"to\" har ikke start eller slutt i \"via\"-node." -#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-linje." -#: ../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 "linje med «to» har ikke start eller slutt i en «via»-linje." -#: ../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 "Fant ikke stil for restriksjon {0}." -#: ../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 "Ingen fornuftig rolle «{0}» for linje «{1}»." -#: ../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 "Multipolygon-medlem «{0}» er ikke en linje." -#: ../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 "Ingen ytre linje for multipolygon «{0}»." -#: ../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 "Skjæring mellom linjene «{0}» og «{1}»." -#: ../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 "Indre linje «{0}» er utenfor." -#: ../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 "Stil for indre linje «{0}» er samme som multipolygon." -#: ../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 "Stil for ytre linje «{0}» passer ikke." -#: ../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 "Uten egenskaper" -#: ../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 "tekst" @@ -3318,5 +3185,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" @@ -3327,5 +3194,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" @@ -3336,5 +3203,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" @@ -3448,5 +3315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "jernbane" @@ -3478,134 +3345,34 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n" -"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker." - -#. 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 "ukjent" - -#: ../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 "" -"Opplasting til tjeneren feilet fordi nåværende " -"datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Forhåndsbetingelse brutt" +#: ../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 +#, fuzzy +msgid "Bad Request" +msgstr "Rediger racquet" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Ukjent vert" -#: ../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 "" -"Opplasting feilet fordi et element du prøvde " -"å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Objekt allerede slettet" @@ -3824,5 +3591,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}" @@ -4222,4 +3989,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 @@ -4295,8 +4064,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 @@ -4429,5 +4198,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 "slettet" @@ -4487,10 +4256,10 @@ #: ../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 "Nei, avbryt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4498,7 +4267,4 @@ "yo agree?" msgstr "" -"For å beholde den lokale versjonen,
må JOSM sette ID for {0} {1} " -"til 0.
Tjeneren gir elementet en ny ID neste
gang du laster det opp." -"
Er dette OK?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4532,4 +4298,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 @@ -4543,5 +4310,5 @@ msgstr "Objekt" -#: ../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 "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." @@ -4647,4 +4414,40 @@ msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}" +#: ../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 "Ingen gjenværende egenskapskonflikter å løse" + +#: ../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 @@ -4657,24 +4460,23 @@ msgstr "alle" -#: ../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 "Velg en farge" - -#: ../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 -#, fuzzy, java-format +#: ../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 "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4682,12 +4484,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameter «{0}» må ha en verdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4695,15 +4497,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "ikke slettet" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Ikke implementert enda." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4712,17 +4514,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "fra linje" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Slett fra relasjon" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikter i data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4746,24 +4545,8 @@ msgstr[1] "{0} relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Konfliktløsning" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Løs konflikter" - -#: ../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 "Lim inn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4778,9 +4561,75 @@ #: ../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} linje" -msgstr[1] "{0} linjer" +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 "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" + +#: ../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 "sted" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Fjern avgjørelse" + +#. --- 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 "Tast:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Verdi" + +#: ../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 "Enveiskjøring" + +#: ../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 @@ -4807,5 +4656,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}" @@ -4836,5 +4685,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." @@ -4907,13 +4756,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 "Lag: {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 "Relasjoner: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4999,5 +4848,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 "" @@ -5056,5 +4905,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 "Legg til" @@ -5104,5 +4953,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 "Relasjoner" @@ -5195,9 +5044,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] "Opphavsmann" -msgstr[1] "Opphavsmann" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5206,19 +5055,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Vis" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Mer informasjon om denne funksjonen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5293,5 +5139,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}" @@ -5309,9 +5155,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 "" @@ -5562,11 +5403,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 "" @@ -5580,7 +5421,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Rediger relasjoner" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5706,5 +5546,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Steder" @@ -5782,9 +5622,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og " +"flytt musa. Velg: Klik" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5814,17 +5657,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Historikk for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Historikk for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Historikk for {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5833,7 +5676,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Vis historikken for det valgte objektet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5870,22 +5712,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "parameter «{0}» > 0 forventet – leste «{1}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Laster historikk for {0} med ID {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Laster historikk for {0} med ID {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Laster historikk for {0} med ID {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6720,78 +6562,74 @@ #: 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 "Navn" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Versjon {0} lagt til {1} av " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Mer informasjon om denne funksjonen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Siste endring på {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6809,7 +6647,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Gatenavn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6850,12 +6687,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Velg en verdi" +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 "parameter «{0}» må ha en verdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6900,6 +6736,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Reparer konflikter i egenskaper." +msgid "Unsaved data and conflicts" +msgstr "Løs konflikter" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6916,5 +6752,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 "" @@ -6933,5 +6769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6945,7 +6781,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Forkast og avslutt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6958,7 +6793,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Lagre og avslutt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7036,7 +6870,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Ved opplasting" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7045,17 +6878,145 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Gi en kort kommentar for endringene du laster opp:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Objekter som legges til:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objekter som endres:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objekter som slettes:" + +#: ../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 "Last opp endringer" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Fil" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Laste opp disse endringene?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Laster opp" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Tast inn et navn for stedet." + +#: ../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 "Det er ingen valgte objekter å oppdatere" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7288,5 +7249,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." @@ -7344,7 +7304,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Laster ned data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7409,4 +7368,13 @@ msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" + +#: ../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 "" +"Opplasting av ubehandlede GPS-data som kortdata betraktes som " +"skadeligt
Se her for å laste inn GPS spor:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7599,5 +7567,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 "Velg raden som skal slettes" @@ -8069,7 +8037,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Vis objekt-ID i lister" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8084,7 +8051,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Vis objekt-ID i lister" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8457,8 +8423,4 @@ msgstr "Deaktiver" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Tast:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8515,5 +8477,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 @@ -8524,42 +8486,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Legg til nytt lag" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Slett valgt Lag." - -#: ../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 "Mer informasjon om denne funksjonen" #. 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 "Valgfrie attributter:" -#: ../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 "Bruk objektmal «{0}» i gruppe «{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 "Bruk objektmal «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "stengt_vei" -#: ../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 "Ukjent type: {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 @@ -8570,15 +8530,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {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 "Feil ved lesing av {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 "Element type {0} kan brukes." -#: ../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 @@ -8588,18 +8548,18 @@ msgstr[1] "Endre {0} objekt" -#: ../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 "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Endre egenskaper" @@ -8626,5 +8586,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, muligens fordi egenskaper mangler." @@ -8640,7 +8599,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 @@ -8718,5 +8674,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}" @@ -8724,5 +8680,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" @@ -8730,5 +8686,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" @@ -8750,6 +8705,6 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../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 @@ -8759,40 +8714,40 @@ msgstr "Laster ned OSM-data …" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Rediger relasjon #{0} i lag \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8857,10 +8812,10 @@ msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}" -#: ../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 "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8868,11 +8823,9 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Åpner endringssett …" - -#: ../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}" @@ -8880,34 +8833,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 "Åpner endringssett …" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Åpner endringssett …" - -#: ../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 "Åpner endringssett …" - -#: ../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 " @@ -8915,44 +8852,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../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 "Lukker endringssett …" - -#: ../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 "Åpner endringssett …" - -#: ../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 "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Laster opp …" -#: ../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}." @@ -8971,10 +8908,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 "OSM-tjenerfiler bzip2-komprimert" -#: ../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 "Ugyldig bzip2-fil" @@ -9037,6 +8974,11 @@ "
Ikke bruk et verdifullt passord." +#: ../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-tjenerfiler" @@ -9065,5 +9007,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 "OSM-tjenerfiler gzip-komprimert" @@ -9129,76 +9071,145 @@ msgstr "Feil ved innlesing." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Ukjent versjon" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Versjon nummer mangler i OSM data" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "obligatorisk attributt «{0}» mangler" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "obligatorisk attributt «{0}» mangler" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Ukjent versjon: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "obligatorisk attributt «{0}» mangler" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Fant element i ikke_linje." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " har zero ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Fandt -element i en ikke-relation." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "" +"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "Mangler attributt «ref» for medlem av relasjon {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" "Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Ufullstendig -spesifikasjon med 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Ulovlig objekt med 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Ukjent versjon: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Mangler attributt «version» for OSM-element med ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Mangler obligatorisk attributt «{0}»." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" + +#: ../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 "" @@ -9207,16 +9218,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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Klargjør OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Feil id for node" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Klargjør OSM-data …" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Klargjør data …" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9262,33 +9287,43 @@ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." -#: ../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}gjenstår. laster {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}gjenstår. laster {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}gjenstår. laster {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 "Laster opp …" + +#: ../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 "Ingen endringer å laste opp. Finn frem data først." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9326,12 +9361,7 @@ msgstr "Laster ned programtillegg {0} …" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Hopp over nedlasting" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9343,4 +9373,9 @@ msgstr "Hopp over nedlasting" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9383,20 +9418,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 "Fjern programtillegg" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Behold programtillegg" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Behold programtillegg" - -#: ../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 " @@ -9406,5 +9441,9 @@ "skrive over eksisterende." -#: ../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 "" @@ -9412,10 +9451,10 @@ msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." -#: ../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 "I følge nformasjon i tilleggsprogram, er {0} opphavsmann." -#: ../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." @@ -9423,9 +9462,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../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 "Skal programtillegget fjernes?" -#: ../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 " @@ -9435,13 +9474,13 @@ "lese programtillegg." -#: ../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" @@ -9498,4 +9537,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 "ukjent" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9572,4 +9642,96 @@ msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)" +#: ../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 "" +"Opplasting til tjeneren feilet fordi nåværende " +"datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" + +#: ../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 +#, fuzzy +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 "" +"Maksimal områdeavgrensing er 0.25, og din bestilling er for stor. Bestill " +"mindre område eller bruk planet.osm" + +#: ../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 "" +"Opplasting feilet fordi et element du prøvde " +"å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9639,5 +9801,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9646,5 +9808,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9653,5 +9815,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9660,5 +9822,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9667,5 +9829,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9726,40 +9888,39 @@ msgstr "Last opp sporlogger" -#: ../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 "Beskrivelse" -#: ../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 "Oppgi en beskrivelse av sporloggen." -#: ../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 "Oppgi egenskaper til sporet" -#: ../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}" @@ -9767,47 +9928,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 "Kobler til …" -#: ../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 "Opplastingen ble avsluttet" -#: ../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 "Feil under opplastingen" -#: ../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 "GPX opplastingen var vellykket" -#: ../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 "Klarte ikke laste opp. Tjeneren gav følgende svar: " -#: ../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 "Laster opp GPX spor: {0}% ({1} av {2})" -#: ../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 "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet" -#: ../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 "GPX lag er ikke valgt -> Ingen spor å laste opp." -#: ../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 "Ingen Brukernavn er oppgitt." -#: ../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 "Det er ikke oppgitt passord." -#: ../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 "GPX Spor lastes opp" @@ -10025,5 +10186,5 @@ msgstr "Bilder uten egenskaper" -#: ../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 "Jevnfør bilder med GPX spor" @@ -10037,13 +10198,13 @@ msgstr "Automatisk forslag" -#: ../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 "Du bør velge et GPX-spor" -#: ../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 "Intgen GPX-spor er valgt" -#: ../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 "" @@ -10054,9 +10215,9 @@ "Forventet format: {0}" -#: ../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 "Ugyldig tidssone" -#: ../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 "" @@ -10067,65 +10228,65 @@ "Forventet format: {0}" -#: ../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 "Ugyldig forskyvning" -#: ../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 "Fant {0} treff av {1} i GPX spor {2}" -#: ../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 "GPX-spor er lagt inn" -#: ../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 "Valgte foto har ikke tidskode." -#: ../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 "Foto har ikke tidskode." -#: ../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 "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../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 "GPX sporet har ikke tidskoder" -#: ../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 "Tidssone: {0}" -#: ../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 "Minutter: {0}" -#: ../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 "Sekunder: {0}" -#: ../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 "Koplet {0} av {1} foto til GPX spor." -#: ../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 "(Tidsforskjell på {0} dager)" -#: ../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 "Forskyvning mellom spor og foto: {0}m {1}s" -#: ../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 " @@ -10135,13 +10296,13 @@ "synkronisere bildene manuelt." -#: ../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 "Klarte ikke å koble foto til sporet" -#: ../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 "Juster tidssone og forskyvning" -#: ../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 "Standardverdier" @@ -10179,5 +10340,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 "Feil ved lasting av fil" @@ -10206,11 +10367,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Fransk by/sted {0} ikke funnet eller tilgjengelig i WMS.\n" -"Sjekk om det finnes på www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10226,13 +10385,13 @@ msgstr "Velg fra …" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../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" @@ -10245,13 +10404,13 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../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 "JOSM avsluttes for at endringen skal tre i kraft." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10372,9 +10531,9 @@ "De eldste filene blir automatisk slettet når denne størrelsen overskrides" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Automatisk egenskap: kilde er lagt inn:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Legg inn kilde ( source=...) på element?" @@ -10484,7 +10643,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "laster bilde …" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10530,7 +10688,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Velg" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10618,5 +10775,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 "Blankt lag" @@ -11563,18 +11720,18 @@ msgstr "Ukendt status for feilrapport" -#: ../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 "Åpne synlige …" -#: ../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 "Åpne filer som er synlige i det nåværende synsfelt." -#: ../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 "Ingen arbeidsområde åpnet – kan ikke finne avgrensing." -#: ../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}" @@ -11585,5 +11742,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11592,9 +11749,9 @@ "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender-indstillinger" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox-programfil" @@ -11605,28 +11762,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Lag ny node." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "bytt utvalg" -#: ../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 "bytt arbeidsutsnitt" -#: ../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 "Bekreft alle Remote control handlinger manuelt" -#: ../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 "Et programtillegg som tillater at JOSM blir styrt av et annet program" -#: ../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 "Remote Control" -#: ../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 "Remote Control tilleggsprogram innstillinger." -#: ../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 " @@ -11638,28 +11800,35 @@ "fjernstyring av tilleggsprogrammet." -#: ../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 "Tillatte handlinger" -#: ../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 "Remote Control er bedt om å laste data fra API." -#: ../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 "Be om detaljer: {0}" -#: ../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 "Vil du tillate dette?" -#: ../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 "Bekreft Remote Control handlinger" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Remote Control er bedt om å laste data fra API." + +#: ../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 "Remote Control har bedt om data fra denne URL:" @@ -12159,25 +12328,33 @@ "oppstått." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Legg inn verdier for alle konflikter." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Løs konflikter" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Slå sammen arealer: fjern korte linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Lukket linje" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" @@ -12249,6 +12426,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 "Valideringsfeil" @@ -12258,10 +12435,10 @@ msgstr "Ingen valideringsfeil" -#: ../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 "Rutenett" -#: ../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 "" @@ -12352,51 +12529,65 @@ msgstr "Kjører datavalidering" -#: ../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 "Data med feil. Last opp uansett?" -#: ../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 "Åpne valideringsvindu" -#: ../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 "Zoom til problem" -#: ../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 "Korriger" -#: ../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 "Korriger valgte feilmeldinger." -#: ../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 "Ignorer" -#: ../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 "Ignorer valgte feilmeldinger neste gang." -#: ../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 "Hele gruppen" -#: ../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 "Enkelte element" -#: ../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 "Intet" -#: ../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 "Ignorer hele gruppen eller enkelte element?" -#: ../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 "Ignorerer element" + +#: ../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 "Laster opp …" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12422,16 +12613,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Denne testen undersøker om to veier, jernbaner eller vannveier krysser i " -"samme lag, uten å være knyttet i knutepunkt." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Lag bygninger" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12439,19 +12626,18 @@ msgstr "Kryssende veier" -#: ../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 "Dobbelt-Noder" -#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Noder med samme navn" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12459,19 +12645,16 @@ #: ../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 "Fordoble linje" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Opprett kopi av linje" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13042,5 +13225,5 @@ msgstr "Nådde et kryss" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Det oppsto en feil" @@ -13147,5 +13330,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 " @@ -13153,5 +13336,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 "Ingen gyldig WMS-URL eller ID" @@ -13169,17 +13352,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 "" @@ -13222,19 +13405,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "brukertype" - -#: ../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 "WMS lag ({0}) laster automatisk ned i zoom {1}" -#: ../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 "WMS lag ({0}) laster ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13245,116 +13427,126 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Ugyldig dato" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../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 "Rediger liste over WMS-tjenere som vises i WMS-programtillegg" -#: ../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 "Meny Navn" -#: ../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 "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Kopier Standard" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Velg minst én linje" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Nedlaster:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Overlapp kartbilder" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% av bredden:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% av bredden:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TCX filer (*.tcx)" +msgstr "" #. * @@ -13753,5 +13945,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 "Veinummer" @@ -14293,7 +14485,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Feriehytter" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14314,8 +14505,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 "Bilutleie" +msgstr "" #. color heath @@ -14333,5 +14523,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 "skogsområde" @@ -14344,7 +14535,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkeringsbillett" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14380,7 +14570,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "brostein" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14391,7 +14580,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "uferdig" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14402,7 +14590,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "gress" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14596,4 +14783,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" @@ -14622,12 +14810,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 "ja" #. color permissive -#. +#. #. 1 #. 40000 @@ -14675,5 +14863,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14710,5 +14898,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14772,6 +14960,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 "nei" @@ -14917,6 +15106,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 "Type" @@ -15187,7 +15376,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Gågate" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15206,7 +15394,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pigghinder" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15498,7 +15685,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 "Operatør" @@ -15711,6 +15898,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 "Høyde" @@ -16622,7 +16809,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" @@ -16670,23 +16854,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 "Åpningstider" @@ -16710,5 +16894,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" @@ -16755,22 +16938,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 "" @@ -16785,22 +16968,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 "" @@ -16815,22 +16998,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 "" @@ -16864,5 +17047,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 "Referansenummer" @@ -16882,7 +17065,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Innfartsparkering" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16896,7 +17078,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapasitet" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16906,12 +17087,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Handicap-plasser" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Handicap-plasser" +msgstr "" #: build/trans_presets.java:1400 @@ -17113,5 +17292,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Leskur / Ly for natten" @@ -17496,7 +17675,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Full stopp" +msgstr "" #. color tertiary @@ -17539,28 +17717,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "kinesisk" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Last ned område" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Lim inn" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Storby" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "lokal" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17588,7 +17761,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Fjellsti" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17602,7 +17774,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "Sidespor" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17619,13 +17790,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Tollstasjon" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "begynner" +msgstr "" #: build/trans_presets.java:1737 @@ -17642,31 +17811,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "bruk av grunn" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Veiviser (turvei)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informasjon" +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 "Nærmere forklaring" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "" #. @@ -17677,7 +17841,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefonnummer" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18001,5 +18164,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18033,5 +18196,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19157,6 +19320,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 "Religion" @@ -19165,66 +19328,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 "bahai" -#: 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 "buddhist" -#: 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 "kristen" -#: 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 "jain" -#: 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 "jødisk" -#: 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 "muslim" -#: 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 "unitarisk" -#: 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 "zoroastrisk" -#: 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 "Trosretniing" @@ -19233,76 +19396,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 "anglikansk" -#: 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 "katolsk" -#: 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 "evangelisk" -#: 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 "Jehovas vitner" -#: 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 "luthersk" -#: 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 "mormoner" -#: 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 "ortodoks" -#: 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 "pinsebevegelsen" -#: 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 "presbyteriansk" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" @@ -19634,5 +19797,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 "Kommentar" @@ -19657,5 +19820,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 "Mynter" @@ -19663,5 +19826,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 "Sedler" @@ -19669,5 +19832,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 "Elektronisk lommebok eller betalingskort" @@ -19675,5 +19838,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 "Bankkort" @@ -19681,5 +19844,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 "Kredittkort" @@ -19738,10 +19901,144 @@ msgstr "Benk" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Tilbake" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Minneplatte" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "ingen" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "sted" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Farge" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Tilbake" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "ned" + +#. 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 "grønn" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "avslutt" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Verdi" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "vann" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Antall ledere" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Jaktpost" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" @@ -19750,30 +20047,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 "Høyde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "lav" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "halv" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "full" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontene" @@ -19782,10 +20079,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Drikkevann" @@ -19794,10 +20091,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Stellebord" @@ -19805,35 +20102,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Rediger stellebord" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Feriehytter" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Rediger feriehytter" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Minimarked" @@ -19841,9 +20136,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Rediger Minimarked" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19851,29 +20146,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Rediger 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 "Rediger bussholdeplass" - -#: 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 "Rediger tre" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Automat" @@ -19881,5 +20174,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -19887,88 +20180,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "mat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "foto" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "frimerke" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "sedler" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Slakter" @@ -19976,9 +20269,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Rediger slakter" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Baker" @@ -19986,9 +20279,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Rediger baker" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Blomster" @@ -19996,18 +20289,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Rediger blomster" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Økologisk" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Sprit og vin" @@ -20015,54 +20308,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Drikke" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Dataelektronikk" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronikk" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Møbler" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Hagesenter" @@ -20070,9 +20363,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Jernvarehandel" @@ -20080,9 +20373,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -20090,54 +20383,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Kontor" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Frisør" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Leker" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Rediger leker" -#: 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 "Rediger video" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Renseri" @@ -20145,9 +20438,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Vaskeri" @@ -20155,9 +20448,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -20165,32 +20458,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" -#: 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 "Rediger sport" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Rediger optiker" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -20198,14 +20491,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Rediger bank" -#: 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 "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Veksle valuta" @@ -20213,5 +20506,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Rediger valutaveksling" @@ -20219,15 +20512,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Lege" @@ -20235,18 +20528,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Rediger lege" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Tannlege" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Rediger tannlege" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apotek" @@ -20254,5 +20547,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -20260,9 +20553,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Reseptlevering" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Sykehus" @@ -20270,10 +20563,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -20282,5 +20575,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -20289,20 +20582,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -20310,5 +20603,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 "Veterinær" @@ -20317,55 +20610,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Rediger veterinær" #. 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 "Rediger kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Rediger land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Delstat/provins" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Kommune" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Rediger kommune" @@ -20373,15 +20666,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Storby" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Rediger storby" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "By" @@ -20389,10 +20682,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Rediger by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Forstad/bydel" @@ -20400,25 +20693,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Landsby" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Rediger landsby" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Grend" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -20426,5 +20719,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Lokalitet" @@ -20432,10 +20725,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Øy" @@ -20443,24 +20736,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Rediger øy" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "venstre" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Rediger feriehytter" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Huleinngang" @@ -20468,10 +20759,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Fjelltopp" @@ -20479,10 +20770,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Isbre" @@ -20490,10 +20781,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkan" @@ -20501,70 +20792,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nasjonal" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Fylkesgrense" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Kommunegrense" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Nasjonalpark" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Tre" @@ -20573,15 +20864,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Skogsområde" @@ -20590,5 +20881,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -20596,17 +20887,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 "barskog" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Skog" @@ -20615,14 +20906,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -20630,25 +20921,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Steinur" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Krattskog" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Fjell" @@ -20656,10 +20947,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Beite" @@ -20667,5 +20958,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Rediger beite" @@ -20673,5 +20964,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Gårdstun" @@ -20680,45 +20971,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Åkerland" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Eng" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Hageparseller" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -20726,25 +21017,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Hage" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Gress" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Friområde" @@ -20752,10 +21043,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Offentlig" @@ -20763,20 +21054,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Rediger offentlig" #. 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 "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -20784,5 +21075,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -20790,15 +21081,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Boligområde" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Gravlund" @@ -20806,9 +21097,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Kirkegård" @@ -20816,39 +21107,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Forretninger" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Næringsområde" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industriområde" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Jernbanegrunn" @@ -20856,15 +21147,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Millitært" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Rediger millitært" @@ -20872,55 +21163,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Byggeplass" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Rivningsområde" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Byggeområde" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Avfallsdeponi" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Steinbrudd" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -20930,5 +21221,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 "Rediger multipolygon" @@ -20937,10 +21228,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "ytre linjesegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "indre linjesegment" @@ -20948,5 +21239,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Svingeforbud" @@ -20955,5 +21246,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -20961,34 +21252,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -20997,15 +21288,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "til linje" @@ -21013,5 +21304,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Rute" @@ -21020,5 +21311,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Rediger rute" @@ -21026,5 +21317,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Rutetype" @@ -21032,5 +21323,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21096,5 +21387,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 @@ -21103,17 +21394,17 @@ msgstr "sykkel" -#: 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 "vei" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "ski" @@ -21166,5 +21457,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 @@ -21173,13 +21464,13 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "tur" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "omkjøring" @@ -21193,10 +21484,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Symbolforklaring" @@ -21204,31 +21495,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Nettverk" #. 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 "planlagt" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Farge (hex)" @@ -21237,30 +21528,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -24413,76 +24704,4 @@ msgstr "historisk" -#. 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 "grønn" - #. color green #. @@ -25450,9 +25669,73 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." +#. 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 "Alle linjene var tomme" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Samle noder med forskjellige relasjoner?" + +#~ msgid "Merge Anyway" +#~ msgstr "Samle noder allikevel" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " +#~ "samle noder?" + +#~ msgid "Unknown version" +#~ msgstr "Ukjent versjon" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Versjon nummer mangler i OSM data" + +#~ msgid "Found element in non-way." +#~ msgstr "Fant element i ikke_linje." + +#~ msgid " has zero ref" +#~ msgstr " har zero ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Fandt -element i en ikke-relation." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." + +#~ msgid "Ill-formed node id" +#~ msgstr "Feil id for node" + +#~ msgid "Move" +#~ msgstr "Flytt" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Noen av nodene er (nesten) på linje" + +#~ msgid "Email" +#~ msgstr "E-post" + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Hjelp mangler. Kan lages i english." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Hjelp mangler. Kan lages i english ellerr norsk bokmål." + +#~ msgid "unnamed" +#~ msgstr "uten navn" #~ msgid "" @@ -25466,95 +25749,4 @@ #~ msgstr "Ingen åpne dokument å lagre" -#~ msgid "Delete {1} {0}" -#~ msgstr "Slett {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Fjern relasjonsmedlem {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" - -#~ msgid "nodes" -#~ msgstr "noder" - -#~ msgid "ways" -#~ msgstr "linjer" - -#~ msgid "relations" -#~ msgstr "relasjoner" - -#~ msgid "changesets" -#~ msgstr "endringssett" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" - -#~ msgid "Delete Layer" -#~ msgstr "Slett Lag" - -#~ msgid "Authors: {0}" -#~ msgstr "Opphavsmenn: {0}" - -#~ msgid "Public" -#~ msgstr "Offentlig" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " -#~ "openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." - -#~ msgid "Continue anyway" -#~ msgstr "Fortsett uansett" - -#~ msgid "Edit Information Office" -#~ msgstr "Rediger turistinformasjon" - -#~ msgid "Map Type" -#~ msgstr "Karttype" - -#~ msgid "map" -#~ msgstr "kart" - -#~ msgid "citymap" -#~ msgstr "bykart" - -#~ msgid "hikingmap" -#~ msgstr "turkart" - -#~ msgid "bicyclemap" -#~ msgstr "sykkelkart" - -#~ msgid "Board Type" -#~ msgstr "Tavletype" - -#~ msgid "board" -#~ msgstr "infotavle" - -#~ msgid "Move" -#~ msgstr "Flytt" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Noen av nodene er (nesten) på linje" - -#~ msgid "Email" -#~ msgstr "E-post" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Hjelp mangler. Kan lages i english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Hjelp mangler. Kan lages i english ellerr norsk bokmål." - -#~ msgid "unnamed" -#~ msgstr "uten navn" - #~ msgid "Unknown file extension." #~ msgstr "Ukjent filtype." @@ -25585,4 +25777,7 @@ #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "{0} konflikter må løses i {1} objecter" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slett {1} {0}" #~ msgid "Rotate" @@ -25643,4 +25838,7 @@ #~ msgstr "Konflikter: {0}" +#~ msgid "Delete Layer" +#~ msgstr "Slett Lag" + #~ msgid "Layers: {0}" #~ msgstr "Lag: {0}" @@ -25676,13 +25874,6 @@ #~ msgstr "Relasjons-editor: {0}" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og " -#~ "flytt musa. Velg: Klik" +#~ msgid "Authors: {0}" +#~ msgstr "Opphavsmenn: {0}" #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." @@ -25710,4 +25901,7 @@ #~ msgid "Delete and Download" #~ msgstr "Slett og last ned" + +#~ msgid "Public" +#~ msgstr "Offentlig" #~ msgid "Add a new tagging preset source to the list." @@ -25772,4 +25966,9 @@ #~ msgstr "Feil ved sletting av programtillegg: {0}" +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "" +#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på " +#~ "openstreetmap.org" + #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -25799,9 +25998,12 @@ #~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" -#~ msgid "end" -#~ msgstr "avslutt" - #~ msgid "Import TCX file as GPS track" #~ msgstr "Importer TCX fil som GPS spor" + +#~ msgid "Continue anyway" +#~ msgstr "Fortsett uansett" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting." #~ msgid "No intersections found. Nothing was changed." @@ -25883,4 +26085,7 @@ #~ msgstr "Last inn TCX filer direkte fra JOSM." +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." + #~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " @@ -25893,4 +26098,22 @@ #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" +#~ msgid "Map Type" +#~ msgstr "Karttype" + +#~ msgid "citymap" +#~ msgstr "bykart" + +#~ msgid "hikingmap" +#~ msgstr "turkart" + +#~ msgid "map" +#~ msgstr "kart" + +#~ msgid "bicyclemap" +#~ msgstr "sykkelkart" + +#~ msgid "board" +#~ msgstr "infotavle" + #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." @@ -25899,10 +26122,4 @@ #~ msgstr "koblet" -#~ msgid "Overlap tiles" -#~ msgstr "Overlapp kartbilder" - -#~ msgid "% of lat:" -#~ msgstr "% av bredden:" - #~ msgid "% of lon:" #~ msgstr "% av lengden:" @@ -25914,4 +26131,16 @@ #~ msgstr "Datalag" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan ikke åpne innstillingsmappe: {0}" + +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "relations" +#~ msgstr "relasjoner" + +#~ msgid "ways" +#~ msgstr "linjer" + #~ msgid "Contacting the OSM server..." #~ msgstr "Kontakter OSM-tjeneren …" @@ -25926,4 +26155,8 @@ #~ msgstr "Mangler objekt" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" + #~ msgid "Aborting..." #~ msgstr "Avbryter …" @@ -25931,4 +26164,7 @@ #~ msgid "Import TCX File..." #~ msgstr "Importer TCX-fil …" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren." #~ msgid "Error parsing server response." @@ -25950,4 +26186,10 @@ #~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" #~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." + +#~ msgid "Edit Information Office" +#~ msgstr "Rediger turistinformasjon" + +#~ msgid "Board Type" +#~ msgstr "Tavletype" #~ msgid "YAHOO (WebKit)" @@ -25988,4 +26230,7 @@ #~ "Ikke last opp data etter denne meldingen." +#~ msgid "changesets" +#~ msgstr "endringssett" + #~ msgid "Apply partial resolutions" #~ msgstr "Bruk ufullstendige løsninger" @@ -26005,2 +26250,5 @@ #~ msgid "No data" #~ msgstr "Ingen data" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Fjern relasjonsmedlem {0} {1}" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 17594) +++ /applications/editors/josm/i18n/po/nl.po (revision 17595) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-04 20:21+0000\n" -"Last-Translator: bartgenuit \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 13:31+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\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:37+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 "Help" -#: ../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 "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" -#: ../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,13 +103,13 @@ #: ../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 "Fout" -#: ../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?" @@ -115,42 +117,37 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" -"Wijzigingen zijn niet opgeslagen. Deze wijzigingen negeren en verder gaan?" msgstr[1] "" -"Wijzigingen zijn niet opgeslagen. Deze wijzigingen negeren en verder gaan?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Niet-opgeslagen wijzigingen" -#: ../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 "Sla op en verlaat JOSM" -#: ../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 "Negeer veranderingen en verlaat JOSM" -#: ../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 @@ -159,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 @@ -177,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 "Annuleren" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{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 @@ -207,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 @@ -246,12 +244,14 @@ msgstr "Waarschuwing" -#: ../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 "Ongeldige bestands-URL negeren: \"{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}" @@ -341,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 "Plugins" @@ -471,9 +471,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 @@ -507,6 +507,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 @@ -525,11 +525,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 "Informatie" @@ -551,5 +551,5 @@ msgstr "Selecteer minstens drie knopen:" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -560,10 +560,10 @@ "{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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -572,5 +572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -581,9 +581,9 @@ "maximumwaarde {2}. De lengte is nu {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -638,77 +638,61 @@ msgstr "Geen conflicten om op in te zoomen" -#: ../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 "Wegen combineren." -#: ../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 "Verschillende wegen combineren tot één weg." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Wegen combineren ondanks verschillende relaties?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Toch combineren" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"De geselecteerde wegen zijn onderdeel van niet verschillende relaties. Weet " +"u zeker dat u ze wilt combineren?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Richting omkeren?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Omkeren en combineren" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"De wegen kunnen in hun huidige richtingen niet worden gecombineerd. Wil je " +"de richting van enkele omkeren?" + +#: ../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 "" +"Kan geen wegen combineren (ze kunnen niet worden samengevoegd tot een enkele " +"reeks van knopen)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "{0} wegen combineren" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Selecteer twee of meer wegen om te combineren." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Wegen combineren ondanks verschillende relaties?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Toch combineren" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"De geselecteerde wegen zijn onderdeel van niet verschillende relaties. Weet " -"u zeker dat u ze wilt combineren?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Richting omkeren?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Omkeren en combineren" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"De wegen kunnen in hun huidige richtingen niet worden gecombineerd. Wil je " -"de richting van enkele omkeren?" - -#: ../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 "Waarden voor alle conflicten invoeren." - -#: ../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 "Conflicten oplossen" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "{0} wegen combineren" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Alle wegen zijn leeg" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Kan geen wegen combineren (ze kunnen niet worden samengevoegd tot een enkele " -"reeks van knopen)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -764,5 +748,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 "Verwijderen" @@ -772,15 +756,15 @@ msgstr "Geselecteerde objecten verwijderen." -#: ../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 "Overschrijven?" -#: ../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 "Bestand bestaat al. Overschrijven?" @@ -809,10 +793,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}" @@ -843,5 +827,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 @@ -884,7 +868,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Alle afbeeldingen" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1019,1050 +1002,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 "Knopen samenvoegen" -#: ../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 "Knopen in de oudste samenvoegen" -#: ../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 "Minstens twee knopen selecteren om samen te voegen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Knopen met verschillende relaties samenvoegen?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Toch samenvoegen" - -#: ../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 "" -"De geselecteerde knopen behoren tot verschillende relaties. Wil je ze toch " -"samenvoegen?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Kan knopen niet samenvoegen: zou daarvoor een weg moeten verwijderen die nog " -"in gebruik is." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "{0} knopen samenvoegen" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Spiegelen" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Spiegel de geselecteerde knopen en wegen." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Selecteer ten minste één knoop of weg." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "omhoog" - -#: ../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 "Objecten {0} verplaatsen" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "omlaag" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "links" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "rechts" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "{0} verplaatsen" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Verplaatst objecten {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 "Kan objecten niet buiten de wereld plaatsen." - -#: ../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 "Nieuw" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Een nieuwe kaart aanmaken." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Openen..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Een bestand openen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Een bestand openen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Onbekende rol \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Locatie openen…" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Een URL openen." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Laag scheiden" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "URL om te downloaden invoeren" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Locatie downloaden" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Download-URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Vorm orthogonaal maken" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Slechts twee knopen toegestaan" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Selectie mag slechts wegen bevatten." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." - -#: ../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 "Slechts één knoop geselecteerd" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Orthogonaal maken" - -#: ../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 "Plakken" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Inhoud van het buffer plakken." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Tags plakken" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "{0} laden" -msgstr[1] "{0} laden" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, 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 "Voorkeuren..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Open het voorkeurenscherm voor algemene instellingen." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Voorkeuren" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Opnieuw uitvoeren" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "De laatste ongedaan gemaakte opdracht herstellen." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Laag hernoemen" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Ook het bestand hernoemen" - -#: ../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 "Wegen omkeren" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "De richting van alle geselecteerde wegen omkeren." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Selecteer minstens één weg." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Wegen omkeren" - -#: ../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 "Opslaan" - -#: ../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 "Huidige gegevens opslaan." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Het bestand {0} bestaat al. Overschrijven?" - -#: ../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 "Leeg document" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Het document bevat geen gegevens." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Toch opslaan" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflicten" - -#: ../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 "" -"Er bevinden zich enkele onopgeloste conflicten in het document. Deze worden " -"niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Conflicten verwerpen en opslaan" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "OSM-bestand opslaan" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "GPX-bestand opslaan" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Laag opslaan" - -#: ../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 "Opslaan als..." - -#: ../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 "De huidige gegevens in een nieuw bestand opslaan." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Alles selecteren" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Alle niet-gewiste objecten in de gegevenslaag selecteren. Hiermee worden ook " -"incomplete objecten geselecteerd." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Statusrapport tonen" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Hulp: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Klembord kopiëren en sluiten" - -#: ../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 "Sluiten" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Weg splitsen" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Een weg bij de geselecteerde knoop splitsen." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "De huidige selectie kan niet gebruik worden voor splitsen." - -#: ../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] "De geselecteerde knoop ligt niet in het midden van enige weg." -msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg." - -#: ../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] "" -"Er is meer dan een weg die gebruikt maakt van de node die u geselecteerd " -"heeft, Selecteer ook de weg." -msgstr[1] "" -"Er is meer dan een weg die gebruikt maakt van de nodes die u geselecteerd " -"heeft, Selecteer ook de weg." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen." - -#: ../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] "De geselecteerde weg bevat niet de geselecteerde knoop." -msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen." - -#: ../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 "" -"Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen" - -#: ../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 "" -"De weg kan niet gesplitst worden bij de geselecteerde knopen. (Tip: " -"selecteer knopen in het midden van de weg.)" - -#: ../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 "Weg {0} in {1} delen splitsen" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Changeset sluiten" - -#: ../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 "Changeset sluiten" - -#: ../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 "Changeset openen" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Changeset sluiten" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "GPX-lijnen in-/uitschakelen" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Teken lijnen tussen rauwe GPS punten." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "De algemene instelling \"{0}\" in-/uitschakelen" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Wegen losmaken" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Dubbele knopen die door meerdere wegen worden gebruikt." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "De knoop is met niets anders verbonden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Geen van deze knopen is met iets anders verbonden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Geen van deze wegknopen is met iets anders verbonden" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Selecteer één van beide:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Een getagde knoop, of" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* een knoop die gebruikt is door meer dan een weg, of" - -#: ../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 "" -"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" - -#: ../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 "" -"* een weg heeft één of meer knopen die gebruikt worden door meer dan één " -"weg, of" - -#: ../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 "" -"* een weg en één of meer van zijn knopen die gebruikt worden door meer dan " -"één weg." - -#: ../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 "" -"Merk op: Als een weg geselecteerd is, dan krijgt deze weg nieuwe kopieën\n" -"van de losgemaakte knopen en de nieuwe knopen zullen geselecteerd worden.\n" -"Anders zouden alle wegen hun eigen kopie krijgen en alle knopen zouden\n" -"geselecteerd worden." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Ongebonden knoop" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplicaat in {0} knopen" - -#. 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 "Duplicaatknopen {0} in {1} knopen" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Ongedaan maken" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "De laatste opdracht opgedaan maken." - -#: ../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 "Alles deselecteren" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Alle objecten deselecteren." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Alles deselecteren (focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Alles (escape) deselecteren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Gegevens bijwerken" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Werkt de huidige gegevenslaag bij vanaf de server (opnieuw downloaden van " -"gegevens)" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Selectie leeg" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Naar OSM uploaden..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Upload alle aanpassingen naar de OSM-server." - -#: ../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 "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Niets om te uploaden. Creëer eerst gegevens." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Geen aanpassingen aanwezig om te uploaden." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synchroniseer alleen {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 "Synchroniseer alle gegevens" - -#: ../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 "Tegenstrijdigheid ontdekt" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Deze veranderingen uploaden?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Aanpassingen uploaden" - -#: ../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 "Een nieuwe knoop aan een bestaande weg toevoegen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Beschrijf kort de veranderingen die je upload:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Kaartinstellingen" - -#: ../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 "Objecten om toe te voegen:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objecten om te bewerken:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objecten om aan te verwijderen:" - -#: ../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] "Objecten om toe te voegen:" -msgstr[1] "Objecten om toe te voegen:" - -#: ../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] "Objecten om te bewerken:" -msgstr[1] "Objecten om te bewerken:" - -#: ../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] "Objecten om aan te verwijderen:" -msgstr[1] "Objecten om aan te verwijderen:" - -#: ../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 "Laatste verandering op {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Inzoomen" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Uitzoomen" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Achteruit" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Spring terug" - -#: ../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 "Geluid: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Sneller" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Sneller vooruit" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Vooruit" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Naar voren springen" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Volgende marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Speel vanaf volgende marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Afspelen/Pauzeren" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Afspelen/Pauzeren geluid" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Vorige marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Speel vanaf vorige marker" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Langzamer" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Langzaam vooruit" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "GPS-gegevens worden gedownload" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Gedownloade GPX-gegevens" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Rauwe GPS-gegevens" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Gegevens worden gedownload" - -#: ../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 "Geen gegevens geïmporteerd." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap-gegevens" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Download {0} van {1} ({2} te gaan)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Fouten tijdens download" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Verwijdermodus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Knopen of wegen verwijderen." - -#: ../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 "Modus: {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 "" -"Klik om te verwijderen. SHIFT: verwijder wegsegment. ALT: ongebruikte knopen " -"behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen." - +#: ../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 @@ -2073,7 +1031,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 @@ -2082,6 +1041,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 @@ -2112,4 +1071,894 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Kan knopen niet samenvoegen: zou daarvoor een weg moeten verwijderen die nog " +"in gebruik is." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "{0} knopen samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Spiegelen" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Spiegel de geselecteerde knopen en wegen." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Selecteer ten minste één knoop of weg." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "omhoog" + +#: ../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 "Objecten {0} verplaatsen" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "omlaag" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "links" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "rechts" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "{0} verplaatsen" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Verplaatst objecten {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 "Kan objecten niet buiten de wereld plaatsen." + +#: ../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 "Nieuw" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Een nieuwe kaart aanmaken." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Openen..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Een bestand openen." + +#: ../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 "Locatie openen…" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Een URL openen." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Laag scheiden" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "URL om te downloaden invoeren" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Locatie downloaden" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Download-URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Vorm orthogonaal maken" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Slechts twee knopen toegestaan" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Selectie mag slechts wegen bevatten." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." + +#: ../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 "Slechts één knoop geselecteerd" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Orthogonaal maken" + +#: ../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 "Plakken" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Inhoud van het buffer plakken." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Tags plakken" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items." + +#: ../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 "Voorkeuren..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Open het voorkeurenscherm voor algemene instellingen." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Voorkeuren" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Opnieuw uitvoeren" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "De laatste ongedaan gemaakte opdracht herstellen." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Laag hernoemen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Ook het bestand hernoemen" + +#: ../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 "Wegen omkeren" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "De richting van alle geselecteerde wegen omkeren." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Selecteer minstens één weg." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Wegen omkeren" + +#: ../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 "Opslaan" + +#: ../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 "Huidige gegevens opslaan." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Het bestand {0} bestaat al. Overschrijven?" + +#: ../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 "Leeg document" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Toch opslaan" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Het document bevat geen gegevens." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflicten" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Conflicten verwerpen en opslaan" + +#: ../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 "" +"Er bevinden zich enkele onopgeloste conflicten in het document. Deze worden " +"niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "OSM-bestand opslaan" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "GPX-bestand opslaan" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Laag opslaan" + +#: ../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 "Opslaan als..." + +#: ../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 "De huidige gegevens in een nieuw bestand opslaan." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Alles selecteren" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Alle niet-gewiste objecten in de gegevenslaag selecteren. Hiermee worden ook " +"incomplete objecten geselecteerd." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Statusrapport tonen" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hulp: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Klembord kopiëren en sluiten" + +#: ../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 "Sluiten" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Weg splitsen" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Een weg bij de geselecteerde knoop splitsen." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "De huidige selectie kan niet gebruik worden voor splitsen." + +#: ../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] "De geselecteerde knoop ligt niet in het midden van enige weg." +msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg." + +#: ../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] "" +"Er is meer dan een weg die gebruikt maakt van de node die u geselecteerd " +"heeft, Selecteer ook de weg." +msgstr[1] "" +"Er is meer dan een weg die gebruikt maakt van de nodes die u geselecteerd " +"heeft, Selecteer ook de weg." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen." + +#: ../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] "De geselecteerde weg bevat niet de geselecteerde knoop." +msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen." + +#: ../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 "" +"Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen" + +#: ../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 "" +"De weg kan niet gesplitst worden bij de geselecteerde knopen. (Tip: " +"selecteer knopen in het midden van de weg.)" + +#: ../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 "Weg {0} in {1} delen splitsen" + +#: ../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 "GPX-lijnen in-/uitschakelen" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Teken lijnen tussen rauwe GPS punten." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "De algemene instelling \"{0}\" in-/uitschakelen" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Wegen losmaken" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Dubbele knopen die door meerdere wegen worden gebruikt." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "De knoop is met niets anders verbonden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Geen van deze knopen is met iets anders verbonden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Geen van deze wegknopen is met iets anders verbonden" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Selecteer één van beide:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Een getagde knoop, of" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* een knoop die gebruikt is door meer dan een weg, of" + +#: ../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 "" +"* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" + +#: ../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 "" +"* een weg heeft één of meer knopen die gebruikt worden door meer dan één " +"weg, of" + +#: ../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 "" +"* een weg en één of meer van zijn knopen die gebruikt worden door meer dan " +"één weg." + +#: ../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 "" +"Merk op: Als een weg geselecteerd is, dan krijgt deze weg nieuwe kopieën\n" +"van de losgemaakte knopen en de nieuwe knopen zullen geselecteerd worden.\n" +"Anders zouden alle wegen hun eigen kopie krijgen en alle knopen zouden\n" +"geselecteerd worden." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Ongebonden knoop" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplicaat in {0} knopen" + +#. 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 "Duplicaatknopen {0} in {1} knopen" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Ongedaan maken" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "De laatste opdracht opgedaan maken." + +#: ../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 "Alles deselecteren" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Alle objecten deselecteren." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Alles deselecteren (focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Alles (escape) deselecteren" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Gegevens bijwerken" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Werkt de huidige gegevenslaag bij vanaf de server (opnieuw downloaden van " +"gegevens)" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Selectie leeg" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Naar OSM uploaden..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Upload alle aanpassingen naar de OSM-server." + +#: ../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 "Niets om te uploaden. Creëer eerst gegevens." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Geen aanpassingen aanwezig om te uploaden." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synchroniseer alleen {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 "Synchroniseer alle gegevens" + +#: ../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 "Tegenstrijdigheid ontdekt" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Inzoomen" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Uitzoomen" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Achteruit" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Spring terug" + +#: ../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 "Geluid: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Sneller" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Sneller vooruit" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Vooruit" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Naar voren springen" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Volgende marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Speel vanaf volgende marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Afspelen/Pauzeren" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Afspelen/Pauzeren geluid" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Vorige marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Speel vanaf vorige marker" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Langzamer" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Langzaam vooruit" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "GPS-gegevens worden gedownload" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Gedownloade GPX-gegevens" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Rauwe GPS-gegevens" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Gegevens worden gedownload" + +#: ../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 "Geen gegevens geïmporteerd." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap-gegevens" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Download {0} van {1} ({2} te gaan)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Fouten tijdens download" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Verwijdermodus" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Knopen of wegen verwijderen." + +#: ../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 "Modus: {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 "" +"Klik om te verwijderen. SHIFT: verwijder wegsegment. ALT: ongebruikte knopen " +"behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2226,18 +2075,18 @@ "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren." -#: ../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 "Selecteer" -#: ../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 "Objecten selecteren, verplaatsen en roteren" -#: ../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" @@ -2246,17 +2095,17 @@ msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" -#: ../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 "" @@ -2266,5 +2115,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 "" @@ -2387,7 +2236,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - object met opgegeven ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2439,41 +2287,41 @@ msgstr "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Start zoeken" -#: ../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 "Geen overeenkomst gevonden voor ''{0}''" -#: ../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 "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../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 "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../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 "{0} overeenkomsten gevonden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2487,40 +2335,40 @@ "{2}" -#: ../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 "" -#: ../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 "Onverwacht token: {0}" -#: ../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 "Ontbrekende argumenten voor OR." -#: ../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 "Ontbrekend argument voor NOT." -#: ../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 "Sluithaak verwacht." -#: ../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 "" @@ -2529,5 +2377,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." @@ -2564,7 +2412,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Knoop toevoegen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2574,52 +2422,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relaties: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "{0} object wijzigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Laatste verandering op {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Relatie wijzigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Verwijder \"{0}\" voor {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Verwijder \"{0}\" voor {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Verwijder \"{0}\" voor {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Stel in {0}={1} voor {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Stel in {0}={1} voor {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Stel in {0}={1} voor {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2689,30 +2537,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] "{0} {1} verwijderen" -msgstr[1] "{0} {1} verwijderen" +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] "Verwijdermodus" -msgstr[1] "Verwijdermodus" +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] "{0} {1} verwijderen" -msgstr[1] "{0} {1} verwijderen" +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] "Uit relatie verwijderen" -msgstr[1] "Uit relatie verwijderen" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2726,20 +2574,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n" -"Uit relatie verwijderen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n" -"Verwijder van relatie?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2750,5 +2594,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." @@ -2829,17 +2673,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Los {0} tag-conflicten op in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Los {0} tag-conflicten op in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Los {0} tag-conflicten op in {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2849,17 +2693,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Versieconflicten voor {0} {1} oplossen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Versieconflicten voor {0} {1} oplossen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Versieconflicten voor {0} {1} oplossen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2998,9 +2842,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3067,5 +2911,5 @@ msgstr "O" -#: ../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 @@ -3073,23 +2917,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 "Parameter \"{0}\" mag niet leeg zijn." + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Fout: {0}" -#: ../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 "Waarschuwing: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "Onverwacht token: {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Onverwacht token: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Onverwacht token: {0}" + #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 #, java-format @@ -3102,11 +2971,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 "" @@ -3157,9 +3031,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 "Oppervlak van weg is niet gesloten." -#: ../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." @@ -3168,118 +3042,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 "Relatie bevat leeg lid." -#: ../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 "Lid \"{0}\" in relatie wissen." -#: ../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 "Weg \"{0}\" met minder dan twee punten." -#: ../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 "Meer dan een \"van\"-weg gevonden." -#: ../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 "Meer dan een \"naar\"-weg gevonden." -#: ../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 "Meer dan éé \"via\" gevonden." -#: ../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 "Onbekende rol \"{0}\"." -#: ../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 "Onbekend lidtype voor \"{0}\"." -#: ../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 "Geen \"van\"-weg gevonden." -#: ../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 "Geen \"naar\"-weg gevonden." -#: ../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 "Geen \"via\"-knoop of -weg gevonden." -#: ../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 "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." -#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" -#: ../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 "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../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 "Stijl voor beperking {0} is niet gevonden." -#: ../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 "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." -#: ../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 "Niet-weg \"{0}\" in multipolygoon." -#: ../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 "Geen buitenweg voor multipolygoon \"{0}\"." -#: ../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 "Kruising tussen wegen \"{0}\" en \"{1}\"." -#: ../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 "Binnenweg \"{0}\" is uitwendig." -#: ../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 "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." -#: ../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 "Stijl voor buitenweg \"{0}\" komt niet overeen." -#: ../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 "niet-getagd" -#: ../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 "tekst" @@ -3302,5 +3176,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" @@ -3311,5 +3185,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" @@ -3320,5 +3194,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" @@ -3433,5 +3307,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "spoorweg" @@ -3463,127 +3337,34 @@ msgstr[1] "{0} leden" -#: ../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 "onbekend" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 +#, fuzzy +msgid "Bad Request" +msgstr "Badminton bewerken" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Onbekende 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 "" @@ -3806,5 +3587,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}" @@ -4184,4 +3965,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 @@ -4253,8 +4036,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 @@ -4377,5 +4160,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 "verwijderd" @@ -4435,5 +4218,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 "" @@ -4475,4 +4258,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 @@ -4486,5 +4270,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 "" @@ -4590,4 +4374,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 "Geen tag-conflicten om op te lossen" + +#: ../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 @@ -4600,24 +4420,23 @@ msgstr "alles" -#: ../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 "Kies een kleur" - -#: ../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}''" @@ -4625,7 +4444,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 "Parameter \"{0}\" mag niet leeg zijn." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4638,15 +4457,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "niet verwijderd" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 "Nog niet geïmplementeerd." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4655,17 +4474,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "vanaf weg" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Uit relatie verwijderen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Tegenstrijdigheden in de gegevens" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4689,24 +4505,8 @@ msgstr[1] "{0} relaties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Resolutie veranderen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Conflicten oplossen" - -#: ../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 "Plakken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4721,9 +4521,75 @@ #: ../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} weg" -msgstr[1] "{0} wegen" +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 "De leden in de huidige tabelrij uit deze relatie verwijderen" + +#: ../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 "plaats" + +#: ../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 +#, fuzzy +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 "Toets:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Waarde" + +#: ../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 "Éénrichting" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4750,5 +4616,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}" @@ -4781,5 +4647,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." @@ -4854,13 +4720,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 "Laag: {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 "Relaties: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4946,5 +4812,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 "" @@ -5003,5 +4869,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 "Toevoegen" @@ -5051,5 +4917,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 "Relaties" @@ -5144,9 +5010,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] "Auteur" -msgstr[1] "Auteur" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5159,7 +5025,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Meer informatie over deze functionaliteit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5240,5 +5105,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}" @@ -5256,9 +5121,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 "" @@ -5509,11 +5369,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 "" @@ -5527,7 +5387,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Vroege plugins laden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5654,5 +5513,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Locaties" @@ -5730,9 +5589,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zoom: muiswiel of dubbelklik. Verplaats kaart: rechter muisknop indrukken " +"en muis bewegen. Selecteer" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5781,7 +5643,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "De huidige voorkeuren naar de server uploaden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5814,7 +5675,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "Onverwacht token: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 @@ -6664,52 +6525,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 "Naam" @@ -6719,21 +6580,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 "Relatie wijzigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Meer informatie over deze functionaliteit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Laatste verandering op {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6751,7 +6610,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Straatnaam" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6792,12 +6650,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Selecteer een waarde" +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 "Parameter \"{0}\" mag niet leeg zijn." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6841,6 +6698,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" -msgstr "" +#, fuzzy +msgid "Unsaved data and conflicts" +msgstr "Conflicten oplossen" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6857,5 +6715,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 "" @@ -6874,5 +6732,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6886,7 +6744,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Negeer veranderingen en verlaat JOSM" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6899,7 +6756,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Sla op en verlaat JOSM" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6977,7 +6833,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Tijdens uploaden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6986,12 +6841,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Beschrijf kort de veranderingen die je upload:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Objecten om toe te voegen:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objecten om te bewerken:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objecten om aan te verwijderen:" + +#: ../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 "Aanpassingen uploaden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Bestand" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Deze veranderingen uploaden?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Herladen" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Voer een naam in voor de locatie." + +#: ../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 @@ -7228,5 +7212,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." @@ -7284,7 +7267,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Gegevens worden gedownload" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7349,4 +7331,13 @@ msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" + +#: ../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 "" +"Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk " +"zijn.
Als je sporen wilt uploaden, kijk dan hier:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7539,5 +7530,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 "Selecteer een rij om te verwijderen." @@ -8021,7 +8012,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Object-id in selectielijsten tonen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8036,7 +8026,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Object-id in selectielijsten tonen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8414,8 +8403,4 @@ msgstr "Uitschakelen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Toets:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8472,5 +8457,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 @@ -8481,42 +8466,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Een nieuwe laag toevoegen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "De geselecteerde laag verwijderen." - -#: ../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 "Meer informatie over deze functionaliteit" #. 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 "Optionele attributen:" -#: ../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 "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" -#: ../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 "Voorkeuze ''{0}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "afgesloten weg" -#: ../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 "Onbekend type: {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 @@ -8527,15 +8510,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {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 "Fout bij ontleden van {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 "Elementen van type {0} worden ondersteund." -#: ../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 @@ -8545,18 +8528,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../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 "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -8583,5 +8566,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 "NullPointer-uitzondering, mogelijk ontbreken er tags." @@ -8597,7 +8579,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 @@ -8675,5 +8654,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}" @@ -8681,5 +8660,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" @@ -8687,5 +8666,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" @@ -8706,6 +8684,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 @@ -8715,40 +8693,40 @@ msgstr "OSM-gegevens downloaden" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8810,10 +8788,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 "" @@ -8821,11 +8799,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 "Changeset openen" - -#: ../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}" @@ -8833,34 +8809,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 "Changeset openen" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Changeset openen" - -#: ../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 "Changeset openen" - -#: ../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 " @@ -8868,44 +8828,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../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 "Changeset sluiten" - -#: ../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 "Changeset openen" - -#: ../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 "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Uploaden..." -#: ../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}." @@ -8924,10 +8884,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 "" @@ -8986,6 +8946,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 Server bestanden" @@ -9014,5 +8979,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 "" @@ -9069,74 +9034,139 @@ msgstr "Fout tijdens ontleden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Onbekende versie" - -#: ../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 "Verplicht attribuut \"{0}\" ontbreekt." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "API-versie: {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 in niet-weg gevonden." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " heeft geen referenties" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "-element in niet-relatie gevonden." - -#: ../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 "Incomplete -specificatie met 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 "Ongeldig object met 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 "Verplicht attribuut \"{0}\" ontbreekt." #: ../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 "" @@ -9145,16 +9175,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 "OSM-gegevens voorbereiden..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Misvormde knoop-id" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "OSM-gegevens voorbereiden..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Gegevens voorbereiden..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9200,33 +9244,43 @@ "Kan niet met de OSM-server verbinden. Controleer je internetverbinding." -#: ../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} te gaan. Uploading {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} te gaan. Uploading {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} te gaan. Uploading {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 "Uploaden..." + +#: ../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 "Niets om te uploaden. Creëer eerst gegevens." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9264,11 +9318,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 "" @@ -9281,4 +9330,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 @@ -9320,20 +9374,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 "Plugin uitschakelen" #: ../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 "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?" -#: ../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 " @@ -9343,5 +9397,9 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../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 "" @@ -9351,10 +9409,10 @@ "\"-plugin." -#: ../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 "Volgens de informatie in de plugin, is de auteur {0}." -#: ../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." @@ -9363,9 +9421,9 @@ "fout rapporteert." -#: ../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 "Moet de plugin worden uitgeschakeld?" -#: ../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 " @@ -9375,13 +9433,13 @@ "uit de applicatie te halen." -#: ../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" @@ -9438,4 +9496,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 "onbekend" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9510,4 +9599,91 @@ msgstr "(De tekst is reeds gekopieerd naar je klembord.)" +#: ../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 +#, fuzzy +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 "" +"De grootte van het maximale omvattende gebied is 0.25 en je verzoek is te " +"groot. Kies een kleiner gebied of gebruik planet.osm" + +#: ../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 @@ -9577,5 +9753,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9584,5 +9760,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9591,5 +9767,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9598,5 +9774,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9605,5 +9781,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9662,40 +9838,39 @@ msgstr "Sporen uploaden" -#: ../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 "Beschrijving" -#: ../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}" @@ -9703,47 +9878,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 "Verbinden..." -#: ../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 "Uploaden afgebroken" -#: ../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 "Uploaden is mislukt" -#: ../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 "GPX-track is geupload" -#: ../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 "Upload is mislukt. Server gaf de volgende melding: " -#: ../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 "GPX-track uploaden: {0}% ({1} van {2})" -#: ../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 "Geen beschrijving opgegeven. Voer deze s.v.p. in," -#: ../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 "Geen GPX-laag geselecteerd. Kan geen spoor uploaden." -#: ../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 "Geen gebruikersnaam opgegeven." -#: ../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 "Geen wachtwoord opgegeven." -#: ../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 "GPX-track uploaden" @@ -9962,5 +10137,5 @@ msgstr "Nog niet getagde afbeeldingen" -#: ../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 "Verband tussen afbeeldingen en GPX-tracks leggen" @@ -9974,13 +10149,13 @@ msgstr "Automatisch schatten" -#: ../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 "U mag een GPX-track selecteren" -#: ../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 "Geen GPX-tracks geselecteerd" -#: ../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 "" @@ -9991,9 +10166,9 @@ "Verwachte indeling: {0}" -#: ../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 "Ongeldige tijdzone" -#: ../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 "" @@ -10004,26 +10179,26 @@ "Verwachte indeling: {0}" -#: ../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 "Ongeldige verschuiving" -#: ../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 "{0} overeenkomsten van {1} gevonden in GPX-track {2}" -#: ../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 "GPX-track geladen" -#: ../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 "De selecteerde foto's bevatten geen tijdinformatie." -#: ../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 "Foto's bevatten geen tijdinformatie." -#: ../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." @@ -10031,39 +10206,39 @@ "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." -#: ../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 "GPX-track heeft geen tijdinformatie" -#: ../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 "Tijdzone: {0}" -#: ../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 "Minuten: {0}" -#: ../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 "Seconden: {0}" -#: ../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 "{0} van de {1} foto's komen overeen met GPX-track." -#: ../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 "(Tijdverschil van {0} dagen)" -#: ../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 " @@ -10071,13 +10246,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 "Koppelen van foto's aan track is mislukt" -#: ../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 "Tijdzone en tijdverschil aanpassen" -#: ../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 "Standaardwaarden" @@ -10115,5 +10290,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 "Laden bestand is mislukt" @@ -10142,11 +10317,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Stad/dorp {0} is niet gevonden of niet beschikbaar in WMS.\n" -"Controleer de beschikbaarheid op www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10162,13 +10335,13 @@ msgstr "Kies uit..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../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" @@ -10177,13 +10350,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 "" @@ -10304,9 +10477,9 @@ "overschreden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Bron auto-tag toegevoegd:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Voeg \"source=...\" toe aan elementen?" @@ -10461,7 +10634,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Selecteer" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10550,5 +10722,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 "Lege laag" @@ -11492,18 +11664,18 @@ msgstr "Onderwerpstatus onbekend" -#: ../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 "Zichtbare openen." -#: ../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 "Alleen bestanden die zichtbaar zijn in het huidige beeld openen." -#: ../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 "Geen beeld geopend - kan de grenzen niet bepalen!" -#: ../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}" @@ -11514,5 +11686,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11522,9 +11694,9 @@ "kaartinstellingenpagina van Voorkeuren." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender-optie" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox-executable" @@ -11535,28 +11707,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Nieuwe node maken." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "de selectie aanpassen" -#: ../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 "het venster aanpassen" -#: ../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 "Alle remote-controlopdrachten handmatig bevestigen" -#: ../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 "Een plugin waarmee JOSM door andere applicaties geregeld kan worden." -#: ../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 "Afstandsbediening" -#: ../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 "Instellingen voor de Afstandsbedieningsplugin." -#: ../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 " @@ -11568,28 +11745,35 @@ "applicaties die met deze plugin communiceren." -#: ../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 "Toegestane opdrachten" -#: ../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 "Afstandsbediening is gevraagd gegevens uit de API te laden." -#: ../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 "Gewenste details: {0}" -#: ../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 "Wil je dit toestaan?" -#: ../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 "Remote-controlopdracht bevestigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden." + +#: ../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 "" @@ -12087,25 +12271,33 @@ "of er geen fouten zijn geïntroduceerd." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Waarden voor alle conflicten invoeren." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Conflicten oplossen" + #: ../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 "" @@ -12183,6 +12375,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 "Validatiefouten" @@ -12192,10 +12384,10 @@ msgstr "Geen validatiefouten" -#: ../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 "Raster" -#: ../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 "" @@ -12286,51 +12478,65 @@ msgstr "Gegevensvalidatie uitvoeren" -#: ../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 "Gegevens met fouten. Toch uploaden?" -#: ../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 "Het validatiescherm openen." -#: ../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 "Op probleem inzoomen" -#: ../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 "Herstellen" -#: ../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 "De geselecteerde fouten herstellen." -#: ../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 "Negeren" -#: ../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 "De geselecteerde fouten de volgende keer negeren." -#: ../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 "Gehele groep" -#: ../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 "Individuele elementen" -#: ../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 "Niets" -#: ../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 "Gehele groep of individuele elementen negeren?" -#: ../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 "Elementen negeren" + +#: ../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 "Uploaden..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12356,16 +12562,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"De test controleert of twee wegen, spoorwegen of waterwegen elkaar in " -"dezelfde laag kruisen, terwijl ze niet door dezelfde knoop verbonden zijn." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Gebouwen aanmaken" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12373,20 +12575,19 @@ msgstr "Kruisende wegen" -#: ../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 "Dubbele knopen" -#: ../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 "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Knopen met dezelfde naam" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12394,20 +12595,16 @@ #: ../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 "Weg dupliceren" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." msgstr "" -"Deze test controleert of er geen knopen met precies dezelfde locatie zijn." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Weg dupliceren" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12989,5 +13186,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Uitzondering opgetreden" @@ -13071,5 +13268,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 " @@ -13077,5 +13274,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 "" @@ -13093,17 +13290,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 "" @@ -13147,19 +13344,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "bestemmingsverkeer" - -#: ../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 "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../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 "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13170,14 +13366,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Ongeldige datum" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13185,97 +13380,109 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../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 "WMS-laag in bestand opslaan" -#: ../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 "WMS-laag uit bestand laden" -#: ../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 "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Een lege WMS-laag openen om gegevens uit een bestand in te laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Voorkeuren WMS-plugin" -#: ../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 "" "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond" -#: ../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 "Menunaam" -#: ../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 "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Menunaam (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS-URL (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Een menunaam en WMS-URL invoeren" -#: ../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 "Standaardwaarde kopiëren" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Overlappende gebieden" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Selecteer minstens één weg." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "noord" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13644,5 +13851,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 "Referentie" @@ -14184,7 +14391,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Chalet" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14205,8 +14411,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 "Verhuur" +msgstr "" #. color heath @@ -14224,5 +14429,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 "oerbos" @@ -14235,7 +14441,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkeerbiljet" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14271,7 +14476,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "kinderhoofdjes" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14282,7 +14486,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "onvolledig" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14293,7 +14496,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "gras" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14487,4 +14689,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" @@ -14513,12 +14716,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 "ja" #. color permissive -#. +#. #. 1 #. 40000 @@ -14566,5 +14769,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14601,5 +14804,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14663,6 +14866,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 "nee" @@ -14808,6 +15012,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 "Soort" @@ -15078,7 +15282,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Voetgangers" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15097,7 +15300,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pennen" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15389,7 +15591,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 "Bedrijf" @@ -15602,6 +15804,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 "Stijging" @@ -16513,7 +16715,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" @@ -16561,23 +16760,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 "Openingstijden" @@ -16601,5 +16800,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" @@ -16646,22 +16844,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 "" @@ -16676,22 +16874,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 "" @@ -16706,22 +16904,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 "" @@ -16755,5 +16953,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 "Referentienummer" @@ -16773,7 +16971,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Parkeer en Reis" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16787,7 +16984,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Capaciteit" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16797,12 +16993,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Gehandicaptenplaats" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Gehandicaptenplaats" +msgstr "" #: build/trans_presets.java:1400 @@ -17004,5 +17198,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Schuilplaats" @@ -17387,7 +17581,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop" +msgstr "" #. color tertiary @@ -17430,28 +17623,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "Chinese keuken" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Gebied downloaden" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Plakken" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Stad" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "lokaal" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17479,7 +17667,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Bergwandelen" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17493,7 +17680,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "nevenweg" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17510,13 +17696,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Grenspost" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "beginner" +msgstr "" #: build/trans_presets.java:1737 @@ -17533,7 +17717,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "grondgebruik" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17544,19 +17727,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informatie" +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 "GPS-trackomschrijving" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Geluid" +msgstr "" #. @@ -17567,7 +17747,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefoonnummer" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17891,5 +18070,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17923,5 +18102,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19047,6 +19226,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 "Religie" @@ -19055,66 +19234,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 "Bahai" -#: 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 "Boeddhisme" -#: 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 "Christelijk" -#: 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 "Hindoestaans" -#: 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 "Jain" -#: 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 "Joods" -#: 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 "Moslim" -#: 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 "Spirtualist" -#: 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 "" -#: 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 "Benaming" @@ -19123,76 +19302,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 "Anglicaan" -#: 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 "Katholiek" -#: 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 "Evangelist" -#: 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 "Jehovahs getuigen" -#: 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 "Luthers" -#: 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 "Methodist" -#: 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 "Orthodox" -#: 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 "" -#: 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 "" -#: 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 "Protestant" -#: 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 "Quaker" -#: 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 "" -#: 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 "" @@ -19524,5 +19703,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 "Opmerking" @@ -19547,5 +19726,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 "Munten" @@ -19553,5 +19732,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 "Briefgeld" @@ -19559,5 +19738,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 "Chipknip" @@ -19565,5 +19744,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 "Pinpas" @@ -19571,5 +19750,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 "Creditkaart" @@ -19628,10 +19807,144 @@ msgstr "Bank" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Achteruit" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Herdenkingsplek" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "geen" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "plaats" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Kleur" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Achteruit" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "omlaag" + +#. 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 "groen" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "einde" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Waarde" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "water" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Hoeveelheid draden" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Vogeluitkijkpost" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Vogeluitkijkpost bewerken" @@ -19640,30 +19953,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 "Hoogte" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "Kruiphoogte" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "Bukhoogte" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "Stahoogte" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Verborgen" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Afgesloten" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontein" @@ -19672,10 +19985,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Fontein bewerken" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Drinkwater" @@ -19684,10 +19997,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Drinkwater bewerken" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19695,35 +20008,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 "Winkels" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarkt" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Supermarkt bewerken" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Chalet" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Chalet bewerken" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19731,9 +20042,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19741,29 +20052,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Kiosk bewerken" -#: 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 "Bushalte bewerken" - -#: 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 "Boom bewerken" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Verkoopautomaat" @@ -19771,5 +20080,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Verkoopautomaat bewerken" @@ -19777,88 +20086,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Producten" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "vervoerskaarten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "overzichtskaart" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkeerbiljet" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "voedsel" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "frisdranken" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "snoepgoed" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "sigaretten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "foto's" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "diervoeder" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "kranten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "speelgoed" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "postzegels" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kaarten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "prepaid-kaarten" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "tegoedbonnen" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "condooms" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "hondenpoepzakjes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Klantenkaarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Slager" @@ -19866,9 +20175,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Slager bewerken" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Bakker" @@ -19876,9 +20185,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Bakker bewerken" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Bloemist" @@ -19886,18 +20195,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Bloemist bewerken" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19905,54 +20214,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Dranken" #. 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 "Computer" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Computerwinkel bewerken" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronica" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Elektronicawinkel bewerken" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Hifi-winkel bewerken" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Meubels" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Meubelzaak bewerken" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Tuincentrum" @@ -19960,9 +20269,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Tuincentrum bewerken" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19970,9 +20279,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Doe-het-zelfzaak" @@ -19980,54 +20289,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Doe-het-zelfzaak bewerken" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Kantoorartikelen" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Kantoorartikelenwinkel bewerken" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Kapper" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Kapper bewerken" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Schoenen" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Schoenenwinkel bewerken" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Speelgoed" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Speelgoedwinkel bewerken" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Videotheek" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Videotheek bewerken" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Stomerij" @@ -20035,9 +20344,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Stomerij bewerken" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Wasserette" @@ -20045,9 +20354,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Wasserette bewerken" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Buitensport" @@ -20055,32 +20364,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Buitensportzaak bewerken" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Sportzaak bewerken" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Opticiën bewerken" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Geldzaken" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -20088,14 +20397,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Bank bewerken" -#: 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 "Geldautomaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Geldwisselkantoor" @@ -20103,5 +20412,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Geldwisselkantoor bewerken" @@ -20109,15 +20418,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Geldautomaat bewerken" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Gezondheid" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Huisarts" @@ -20125,18 +20434,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Huisarts bewerken" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Tandarts" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Tandarts bewerken" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apotheek" @@ -20144,5 +20453,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Apotheek bewerken" @@ -20150,9 +20459,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Ziekenhuis" @@ -20160,10 +20469,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Ziekenhuis bewerken" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "EHBO-post" @@ -20172,5 +20481,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "EHBO-post bewerken" @@ -20179,20 +20488,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Puntnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefoonnummer" #. 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 "(Gebruik de landtoegangscode, b.v. +31 20-3456789)" @@ -20200,5 +20509,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 "Dierenarts" @@ -20207,55 +20516,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Dierenarts bewerken" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Een continent bewerken" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Land bewerken" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Provincie" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Provincie bewerken" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Regio" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Regio bewerken" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -20263,15 +20572,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Stad" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Stad bewerken" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Dorp" @@ -20279,10 +20588,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Dorp bewerken" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Deelgemeente" @@ -20290,25 +20599,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Deelgemeente bewerken" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Klein dorp" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Klein dorp bewerken" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Gehucht" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Gehucht bewerken" @@ -20316,5 +20625,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20322,10 +20631,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Eiland" @@ -20333,24 +20642,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Eiland bewerken" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "links" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Chalet bewerken" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Grotingang" @@ -20358,10 +20665,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Grotingang bewerken" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Bergtop" @@ -20369,10 +20676,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Bergtop bewerken" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Gletsjer" @@ -20380,10 +20687,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Gletsjer bewerken" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkaan" @@ -20391,70 +20698,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Vulkaan bewerken" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Landsgrens" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Landsgrens bewerken" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Provincie -of gemeentegrens" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Provincie -of gemeentegrens bewerken" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Grens bebouwde kom" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Grens bebouwde kom bewerken" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Grens kiesdistrict bewerken" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Grens Nationaal park bewerken" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Grondgebruik" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Boom" @@ -20463,15 +20770,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Boom bewerken" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanische naam" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Bos" @@ -20480,5 +20787,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Bos bewerken" @@ -20486,17 +20793,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 "naaldbomen" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "loofbomen" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "gemengd" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Bosbouw" @@ -20505,14 +20812,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Bosbouw bewerken" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Natuurreservaat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Natuurreservaat bewerken" @@ -20520,25 +20827,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Puinhelling" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Puinhelling bewerken" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Kreupelhout" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Kreupelhout bewerken" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20546,10 +20853,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Heide" @@ -20557,5 +20864,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Heide bewerken" @@ -20563,5 +20870,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Boerenerf" @@ -20570,45 +20877,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Boerenerf bewerken" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Landbouwgrond" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Landbouwgrond bewerken" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Weide" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Weideland bewerken" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Wijngaard" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Wijngaard bewerken" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Volkstuinen" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Volkstuinen bewerken" @@ -20616,25 +20923,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Tuin" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Tuin bewerken" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Gras" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Gras bewerken" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Stadsgroen" @@ -20642,10 +20949,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Stadsgroen bewerken" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Algemeen" @@ -20653,20 +20960,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Algemeen bewerken" #. 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 "Park bewerken" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Recreatiegebied" @@ -20674,5 +20981,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Recreatiegebied bewerken" @@ -20680,15 +20987,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Woongebied" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Woongebied bewerken" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Begraafplaats" @@ -20696,9 +21003,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Begraafplaats" @@ -20706,39 +21013,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Winkelcentrum" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Winkelcentrum bewerken" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Kantoren" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Kantoren bewerken" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industrieterrein" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Industrieterrein bewerken" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20746,15 +21053,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militair terrein" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Militair terrein bewerken" @@ -20762,55 +21069,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Bouwterrein" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Bouwterrein bewerken" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Braakliggende grond" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Braakliggende grond bewerken" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Ontwikkelingsgebied" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Ontwikkelingsgebied bewerken" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Vuilstortplaats" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Vuilstortplaats bewerken" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Mijnbouw" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Mijnbouw bewerken" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygoon" @@ -20820,5 +21127,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 "Multipolygoon bewerken" @@ -20827,10 +21134,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "buitensegment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "binnensegment" @@ -20838,5 +21145,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Verkeersbeperking" @@ -20845,5 +21152,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Verkeersbeperking bewerken" @@ -20851,34 +21158,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Beperking" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "niet linksaf" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "niet rechtsaf" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "niet rechtdoor" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "niet keren" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "alleen rechtsaf" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "alleen linksaf" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "alleen rechtdoor" @@ -20887,15 +21194,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "vanaf weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "via knoop of weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "naar weg" @@ -20903,5 +21210,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20910,5 +21217,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20916,5 +21223,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20922,5 +21229,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20986,5 +21293,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 @@ -20993,17 +21300,17 @@ msgstr "fiets" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -21056,5 +21363,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 @@ -21063,13 +21370,13 @@ msgstr "voet" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -21083,10 +21390,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -21094,31 +21401,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -21127,30 +21434,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24303,76 +24610,4 @@ msgstr "historisch" -#. 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 "groen" - #. color green #. @@ -25340,4 +25575,86 @@ 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 "Alle wegen zijn leeg" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Knopen met verschillende relaties samenvoegen?" + +#~ msgid "Merge Anyway" +#~ msgstr "Toch samenvoegen" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze " +#~ "toch samenvoegen?" + +#~ msgid "Unknown version" +#~ msgstr "Onbekende versie" + +#~ msgid "Found element in non-way." +#~ msgstr "-element in niet-weg gevonden." + +#~ msgid " has zero ref" +#~ msgstr " heeft geen referenties" + +#~ msgid "Found element in non-relation." +#~ msgstr "-element in niet-relatie gevonden." + +#~ msgid "Ill-formed node id" +#~ msgstr "Misvormde knoop-id" + +#~ msgid "position" +#~ msgstr "positie" + +#~ msgid "Aborting..." +#~ msgstr "Afbreken..." + +#~ msgid "different" +#~ msgstr "verschillend" + +#~ msgid "true" +#~ msgstr "Waar" + +#~ msgid "Change" +#~ msgstr "Aanpassen" + +#~ msgid "Move" +#~ msgstr "Verplaatsen" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Conflicten oplossen" + +#~ msgid "unnamed" +#~ msgstr "Onbenoemd" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " +#~ "later nog eens." + +#~ msgid "Commit comment" +#~ msgstr "Opmerking bevestigen" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin vereist JOSM-update: {0}" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" @@ -25345,6 +25662,72 @@ #~ "gegevens naar de server." -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." +#~ msgid "Contacting the OSM server..." +#~ msgstr "Met OSM-server verbinden..." + +#~ msgid "Add Selected" +#~ msgstr "Selectie toevoegen" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (lege waarde verwijdert de tag)" + +#~ msgid "Occupied By" +#~ msgstr "Bezet door" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Alle geselecteerde objecten als leden toevoegen" + +#~ msgid "Error parsing server response." +#~ msgstr "Ontleden van de serverreactie is mislukt." + +#~ msgid "There were conflicts during import." +#~ msgstr "Er zijn conflicten tijdens het importeren." + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klik Herladen om lijst te verversen" + +#~ msgid "Revert" +#~ msgstr "Terugdraaien" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan niet met server verbinden." + +#~ msgid "Object" +#~ msgstr "Object" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie " +#~ "geselecteerd in de geschiedenislijst." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xml of Wiki-paginas toevoegen." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin bestaat al" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b." +#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kan plugin niet downloaden: {0} van {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "{1} {0} verwijderen" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Sommige knopen zitten (bijna) op de lijn" #~ msgid "" @@ -25355,155 +25738,6 @@ #~ "dit als fout a.u.b." -#~ msgid "No document open so nothing to save." -#~ msgstr "Geen document geopend, dus ook niets om op te slaan." - -#~ msgid "Delete {1} {0}" -#~ msgstr "{1} {0} verwijderen" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kan voorkeurenmap niet openen: {0}" - -#~ msgid "Delete Layer" -#~ msgstr "Laag verwijderen" - -#~ msgid "Authors: {0}" -#~ msgstr "Auteurs: {0}" - -#~ msgid "Public" -#~ msgstr "Openbaar" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden." - -#~ msgid "Continue anyway" -#~ msgstr "Toch doorgaan" - -#~ msgid "map" -#~ msgstr "kaart" - -#~ msgid "citymap" -#~ msgstr "stadskaart" - -#~ msgid "hikingmap" -#~ msgstr "wandelkaart" - -#~ msgid "bicyclemap" -#~ msgstr "fietskaart" - -#~ msgid "board" -#~ msgstr "bord" - -#~ msgid "position" -#~ msgstr "positie" - -#~ msgid "Aborting..." -#~ msgstr "Afbreken..." - -#~ msgid "different" -#~ msgstr "verschillend" - -#~ msgid "true" -#~ msgstr "Waar" - -#~ msgid "Change" -#~ msgstr "Aanpassen" - -#~ msgid "Move" -#~ msgstr "Verplaatsen" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Conflicten oplossen" - -#~ msgid "unnamed" -#~ msgstr "Onbenoemd" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " -#~ "later nog eens." - -#~ msgid "Commit comment" -#~ msgstr "Opmerking bevestigen" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin vereist JOSM-update: {0}" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Met OSM-server verbinden..." - -#~ msgid "Add Selected" -#~ msgstr "Selectie toevoegen" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (lege waarde verwijdert de tag)" - -#~ msgid "Occupied By" -#~ msgstr "Bezet door" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Alle geselecteerde objecten als leden toevoegen" - -#~ msgid "Error parsing server response." -#~ msgstr "Ontleden van de serverreactie is mislukt." - -#~ msgid "There were conflicts during import." -#~ msgstr "Er zijn conflicten tijdens het importeren." - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klik Herladen om lijst te verversen" - -#~ msgid "Revert" -#~ msgstr "Terugdraaien" - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan niet met server verbinden." - -#~ msgid "Object" -#~ msgstr "Object" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie " -#~ "geselecteerd in de geschiedenislijst." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "site-josm.xml of Wiki-paginas toevoegen." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin bestaat al" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b." -#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Kan plugin niet downloaden: {0} van {1}" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Sommige knopen zitten (bijna) op de lijn" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." #~ msgid "" @@ -25622,16 +25856,6 @@ #~ msgstr "Navigatie" -#~ msgid "end" -#~ msgstr "einde" - #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: muiswiel of dubbelklik. Verplaats kaart: rechter muisknop " -#~ "indrukken en muis bewegen. Selecteer" #~ msgid "Validate" @@ -25644,4 +25868,7 @@ #~ msgstr "" #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download" + +#~ msgid "Authors: {0}" +#~ msgstr "Auteurs: {0}" #~ msgid "Layers: {0}" @@ -25668,4 +25895,7 @@ #~ msgstr "Bronnen tagvoorkeuzen" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan voorkeurenmap niet openen: {0}" + #~ msgid "viaduct" #~ msgstr "viaduct" @@ -25690,4 +25920,7 @@ #~ msgstr "Los {0} conflicten in {1} objecten op" +#~ msgid "No document open so nothing to save." +#~ msgstr "Geen document geopend, dus ook niets om op te slaan." + #~ msgid "Unknown file extension." #~ msgstr "Onbekende bestandsextentie." @@ -25737,4 +25970,19 @@ #~ msgstr "Oberpfalz Geofabrik.de" +#~ msgid "map" +#~ msgstr "kaart" + +#~ msgid "citymap" +#~ msgstr "stadskaart" + +#~ msgid "hikingmap" +#~ msgstr "wandelkaart" + +#~ msgid "bicyclemap" +#~ msgstr "fietskaart" + +#~ msgid "board" +#~ msgstr "bord" + #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n" @@ -25742,4 +25990,10 @@ #~ msgid "Charge" #~ msgstr "Lading" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Openbaar" #~ msgid "Download Image from french Cadastre WMS" @@ -25784,4 +26038,7 @@ #~ msgstr "Omhoog bewegen" +#~ msgid "Delete Layer" +#~ msgstr "Laag verwijderen" + #~ msgid "Delete and Download" #~ msgstr "Verwijder en download" @@ -25809,4 +26066,11 @@ #~ msgid "Select Tableau d'Assemblage" #~ msgstr "Tableau d'Assemblage selecteren" + +#~ msgid "Continue anyway" +#~ msgstr "Toch doorgaan" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden." #~ msgid "" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 17594) +++ /applications/editors/josm/i18n/po/pl.po (revision 17595) @@ -8,7 +8,7 @@ "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-18 14:13+0000\n" -"Last-Translator: Łukasz Jernaś \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-08 10:07+0000\n" +"Last-Translator: t4fun \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,5 +23,5 @@ "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\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" @@ -29,5 +29,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 @@ -36,18 +36,20 @@ msgstr "Pomoc" -#: ../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 "Projekcja {0} nie może zostać aktywowana. Używam Mercatora." -#: ../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 @@ -63,8 +65,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 @@ -78,6 +80,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 @@ -87,5 +89,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 @@ -105,55 +107,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 "Błąd" -#: ../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] "Zmiany nie zostały zapisane. Odrzucić je?" -msgstr[1] "Zmiany nie zostały zapisane. Odrzucić je?" -msgstr[2] "Zmiany nie zostały zapisane. Odrzucić je?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Niezapisane zmiany" -#: ../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 "Zapisz i wyjdź" -#: ../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 "Porzuć i wyjdź" -#: ../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 @@ -162,11 +160,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 @@ -180,20 +179,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 "Anuluj" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{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 @@ -210,16 +209,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 @@ -249,15 +248,17 @@ msgstr "Uwaga" -#: ../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 "Pominięto niepoprawny URL do pliku: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Nie mogę czytać pliku ''{0}''. Komunikat błędu:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -344,5 +345,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 "Wtyczki" @@ -357,20 +358,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"UWAGA: nieoczekiwany format bazowego URL API. Przekierowanie do historycznej " -"strony OSM prawdopodobnie zawiedzie. Bazowy URL API to: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"UWAGA: nieoczekiwany format bazowego URL API. Przekierowanie do historycznej " -"strony OSM prawdopodobnie zawiedzie. Bazowy URL API to: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -477,9 +474,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 @@ -513,6 +510,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 @@ -531,11 +528,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 "Informacje" @@ -557,5 +554,5 @@ msgstr "Wybierz co najmniej trzy węzły." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -566,10 +563,10 @@ "zmian to {0} z możliwych {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 "Naruszenie możliwości API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -578,5 +575,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -585,9 +582,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -642,26 +639,22 @@ msgstr "Brak konfliktów, które można pokazać" -#: ../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 "Połącz drogi" -#: ../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 "Łączy kilka dróg w jedną." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Wybierz co najmniej dwie drogi do połączenia." - -#: ../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 "Czy połączyć drogi, które należą do różnych relacji?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Połącz mimo tego" -#: ../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 " @@ -669,13 +662,13 @@ msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Zmienić kierunek?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Odwróć i połącz" -#: ../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 " @@ -685,32 +678,20 @@ "zmienić kierunek niektórych dróg?" -#: ../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 "Podaj wartości dla wszystkich konfliktów." - -#: ../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 "Rozwiąż konflikty" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 +#: ../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 "" +"Połączenie dróg jest niemożliwe (Drogi nie mogą był złączone w jeden ciąg " +"węzłów)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 #, java-format msgid "Combine {0} ways" msgstr "Połącz {0} dróg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Wszystkie trasy są puste" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Połączenie dróg jest niemożliwe (Drogi nie mogą był złączone w jeden ciąg " -"węzłów)" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Wybierz co najmniej dwie drogi do połączenia." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -766,5 +747,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 "Usuń" @@ -774,15 +755,15 @@ msgstr "Usuwa wybrane obiekty" -#: ../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 "Zastąp" -#: ../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 "Plik istnieje. Nadpisać?" @@ -813,10 +794,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}" @@ -847,5 +828,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 @@ -888,7 +869,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Wszystkie obrazy" +msgstr "Wszystkie formaty" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1025,1047 +1005,25 @@ msgstr "Włącz aktualną warstwę do innej." -#: ../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 "Połącz węzły" -#: ../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 "Scala wybrane węzły z najstarszym." -#: ../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 "Proszę wybierz przynajmniej dwa węzły aby scalić." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Czy scalić węzły z różnych relacji?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Scal mimo tego" - -#: ../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 "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Nie można scalić węzłów - wymagałoby to usunięcia drogi która jest nadal " -"używana." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Scal {0} węzłów" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Połącz wybrane elementy." - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Odbicie lustrzane" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Odwraca zaznoczone węzły i drogi." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Wybierz co najmniej jeden węzeł lub drogę." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "do góry" - -#: ../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 "Przesuń obiekty {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "na dół" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "w lewo" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "w prawo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Przesuń {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Przesuwa obiekty {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 "Nie można przenieść zaznaczonych obiektów poza świat." - -#: ../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 "Nowa" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Tworzy nową mapę" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Otwórz..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Otwiera plik." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Otwiera plik." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Nieznana rola \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Otwórz adres..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Otwórz plik." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Osobna wartwa" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Podaj adres z którego pobrać dane:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Pobierz dane." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Adres URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Korekta prostopadłości" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Dozwolone są tylko dwa węzły" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Zaznaczenie musi składać się wyłącznie z dróg." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej " -"czterech węzłach." - -#: ../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 "Wybrano tylko jeden węzeł" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Korekta prostopadłości" - -#: ../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 "Wklej" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Wkleja zawartość schowka." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Wklej znaczniki" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Wczytywanie {0}" -msgstr[1] "Wczytywanie {0}" -msgstr[2] "Wczytywanie {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Ustawienia..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Otwiera okno ustawień programu." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Ustawienia" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Powtórz" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Powtarza ostatnio wycofaną czynność." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Zmień nazwę warstwy" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "zmień także nazwę pliku" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Nie mogłem przemianować pliku ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Odwróć kierunek dróg" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Proszę zaznaczyć co najmniej jedną drogę." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Odwróć kierunek dróg" - -#: ../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 "Zapisz" - -#: ../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 "Zapisuje bieżące dane." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Plik {0} już istnieje. Nadpisać?" - -#: ../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 "Pusty dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokument nie zawiera żadnych danych." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Zapisz pomimo tego" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikty" - -#: ../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 "" -"Pozostały nierozwiązane konflikty. Wszystkie konfliktowe przypadki zostaną " -"odrzucone. Czy kontunuować?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Odrzuć konflikty i zapisz" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Zapisz plik OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Zapisz plik GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Zapisz warstwę" - -#: ../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 "Zapisz jako..." - -#: ../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 "Zapisuje bieżące dane do nowego pliku." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Zaznacz wszystko" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "Wstecz" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Pokazuje raport konfiguracji programu" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone " -"do informacji o błędzie." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Pomoc: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Raport konfiguracji" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Skopiuj do schowka i zamknij" - -#: ../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 "Zamknij" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Rozdziel drogę" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Rozdziela drogę w zaznaczonym węźle." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." - -#: ../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] "Wybrany węzeł nie jest w środku żadnej drogi." -msgstr[1] "Wybrane węzły nie są w środku żadnej drogi." -msgstr[2] "Wybrane węzły nie są w środku żadnej drogi." - -#: ../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] "Więcej niż jedna droga używa wybrany węzeł. Wybierz także drogę." -msgstr[1] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę." -msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Wybrane węzły nie współdzielą tej samej trasy." - -#: ../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] "Wybrana droga nie zawiera wybranego węzła." -msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów." -msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów." - -#: ../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 "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną." - -#: ../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 "" -"Droga nie może być rozdzielona w wybranych węzłach. (Podpowiedź: Wybierz " -"węzły w środku drogi.)" - -#: ../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 "Rozdziel drogę {0} na {1} części" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Zamykanie zestawu zmian..." - -#: ../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 "Zamykanie zestawu zmian..." - -#: ../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 "Otwieranie zestawu zmian..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Zamykanie zestawu zmian..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Przełącz linie łączące punktu GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Rysuj linie pomiędzy punktami GPS." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Przełącza ustawienie globalne \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Rozdziel drogi" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Powiela węzły które używane są przez różne drogi." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Ten węzeł nie jest przyklejony do niczego więcej." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Żaden z tych węzłów nie jest przyklejony do niczego więcej." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Wybierz przynajmniej:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Jeden węzęł z tagami lub" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub" - -#: ../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 "" -"* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z " -"tych dróg lub" - -#: ../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 "" -"* Jedną drogę która ma jeden lub więcej węzłów użyty przez więcej niż jedną " -"drogę, lub" - -#: ../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 "" -"* Jedną drogę oraz jeden lub więcej jej węzłów, które są użyte przez więcej " -"niż jedną drogę." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Rozdzielenie węzła" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Rozmnóż w {0} węzłów" - -#. 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 "Rozmnóż {0} wezłów w {1} węzłów" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Cofnij" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Cofa ostatnią czynność." - -#: ../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 "Odznacz wszystko" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Odznacza wszystkie obiekty." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Odznacz wszystko (zaznaczenie)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Odznacz wszystko (anulowanie)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Zaktualizuj dane" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)" - -#. 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 "Odświeżanie danych" - -#: ../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 "Aktualizuj zaznaczenie" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Wybrano zbiór pusty." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Wyślij do OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Wysyła wszystkie zmiany na serwer OSM." - -#: ../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 "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Brak zmian do wysłania." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Synchronizuj cały zestaw danych" - -#: ../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 "Wykryto 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 "niespodziewana wartość powrotna. Dostałem {0}" - -#: ../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 "Załadunek się nie powiódł.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Załadunek do API OSM się nie udał." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Czy wysłać te zmiany?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Wyślij zmiany" - -#: ../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 "Dodaj nowy węzeł do istniejącej drogi" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "Załadunek wszystkich zmian w jednym żądaniu." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Ustawienia mapy" - -#: ../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 "Obiekty do dodania:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Obiekty do zmiany:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Obiekty do usunięcia:" - -#: ../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] "Obiekty do dodania:" -msgstr[1] "Obiekty do dodania:" -msgstr[2] "Obiekty do dodania:" - -#: ../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] "Obiekty do zmiany:" -msgstr[1] "Obiekty do zmiany:" -msgstr[2] "Obiekty do zmiany:" - -#: ../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] "Obiekty do usunięcia:" -msgstr[1] "Obiekty do usunięcia:" -msgstr[2] "Obiekty do usunięcia:" - -#: ../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 "Ostatnia zmiana o {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Powiększ" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zmniejsz" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Wstecz" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Wraca do wcześniej odtwarzanego fragmentu." - -#: ../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 "Szybciej" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Zwiększa prędkość odtwarzania." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Do przodu" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Przeskakuje do następnego fragmentu." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Następny znacznik" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Odtwórz następny znacznik." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Odtwórz / wstrzymaj" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Tworzenie węzłów i dróg." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Poprzedni znacznik" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Odtwórz poprzedni znacznik." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Wolniej" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Zmniejsza prędkość odtwarzania." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Pobieranie danych GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Pobrane dane GPX" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "czyste dane GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Pobieranie danych" - -#: ../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 "Nie zaimportowano danych." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "dane OpenSteetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Pobieranie {0} z {1} (pozostało: {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "The following errors occurred during mass download:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Błędy podczas pobierania" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Tryb kasowania" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Usuwanie węzłów lub dróg." - -#: ../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 "Tryb: {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 "" -"Kliknij aby usunąć. Shift: usuwa segment. Alt: nie usuwa węzłów przy " -"usuwaniu drogi. Ctrl: usuwa powiązane obiekty." - +#: ../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 @@ -2076,7 +1034,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 @@ -2085,6 +1044,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 @@ -2115,4 +1074,888 @@ msgstr "parameter ''{0}'' nie może być pusty (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 "" +"Nie można scalić węzłów - wymagałoby to usunięcia drogi która jest nadal " +"używana." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Scal {0} węzłów" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Połącz wybrane elementy." + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Odbicie lustrzane" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Odwraca zaznoczone węzły i drogi." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Wybierz co najmniej jeden węzeł lub drogę." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "do góry" + +#: ../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 "Przesuń obiekty {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "na dół" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "w lewo" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "w prawo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Przesuń {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Przesuwa obiekty {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 "Nie można przenieść zaznaczonych obiektów poza świat." + +#: ../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 "Nowa" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Tworzy nową mapę" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Otwórz..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Otwiera plik." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Otwieram pliki" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Otwieram plik \"{0}\" ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Otwórz adres..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Otwórz URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Osobna wartwa" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Podaj adres z którego pobrać dane:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Pobierz dane." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Adres URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Korekta prostopadłości" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Dozwolone są tylko dwa węzły" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Zaznaczenie musi składać się wyłącznie z dróg." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej " +"czterech węzłach." + +#: ../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 "Wybrano tylko jeden węzeł" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Korekta prostopadłości" + +#: ../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 "Wklej" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Wkleja zawartość schowka." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Wklej znaczniki" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" + +#: ../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 "Ustawienia..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Otwiera okno ustawień programu." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Ustawienia" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Powtórz" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Powtarza ostatnio wycofaną czynność." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Zmień nazwę warstwy" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "zmień także nazwę pliku" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Nie mogłem przemianować pliku ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Odwróć kierunek dróg" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Proszę zaznaczyć co najmniej jedną drogę." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Odwróć kierunek dróg" + +#: ../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 "Zapisz" + +#: ../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 "Zapisuje bieżące dane." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Plik {0} już istnieje. Nadpisać?" + +#: ../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 "Pusty dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Zapisz pomimo tego" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokument nie zawiera żadnych danych." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Odrzuć konflikty i zapisz" + +#: ../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 "" +"Pozostały nierozwiązane konflikty. Wszystkie konfliktowe przypadki zostaną " +"odrzucone. Czy kontunuować?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Zapisz plik OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Zapisz plik GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Zapisz warstwę" + +#: ../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 "Zapisz jako..." + +#: ../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 "Zapisuje bieżące dane do nowego pliku." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Zaznacz wszystko" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "Wstecz" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Pokazuje raport konfiguracji programu" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone " +"do informacji o błędzie." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Pomoc: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Raport konfiguracji" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Skopiuj do schowka i zamknij" + +#: ../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 "Zamknij" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Rozdziel drogę" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Rozdziela drogę w zaznaczonym węźle." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." + +#: ../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] "Wybrany węzeł nie jest w środku żadnej drogi." +msgstr[1] "Wybrane węzły nie są w środku żadnej drogi." +msgstr[2] "Wybrane węzły nie są w środku żadnej drogi." + +#: ../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] "Więcej niż jedna droga używa wybrany węzeł. Wybierz także drogę." +msgstr[1] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę." +msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Wybrane węzły nie współdzielą tej samej trasy." + +#: ../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] "Wybrana droga nie zawiera wybranego węzła." +msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów." +msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów." + +#: ../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 "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną." + +#: ../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 "" +"Droga nie może być rozdzielona w wybranych węzłach. (Podpowiedź: Wybierz " +"węzły w środku drogi.)" + +#: ../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 "Rozdziel drogę {0} na {1} części" + +#: ../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 "Przełącz linie łączące punktu GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Rysuj linie pomiędzy punktami GPS." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Przełącza ustawienie globalne \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Rozdziel drogi" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Powiela węzły które używane są przez różne drogi." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Ten węzeł nie jest przyklejony do niczego więcej." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Żaden z tych węzłów nie jest przyklejony do niczego więcej." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Wybierz przynajmniej:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Jeden węzęł z tagami lub" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub" + +#: ../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 "" +"* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z " +"tych dróg lub" + +#: ../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 "" +"* Jedną drogę która ma jeden lub więcej węzłów użyty przez więcej niż jedną " +"drogę, lub" + +#: ../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 "" +"* Jedną drogę oraz jeden lub więcej jej węzłów, które są użyte przez więcej " +"niż jedną drogę." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Rozdzielenie węzła" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Rozmnóż w {0} węzłów" + +#. 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 "Rozmnóż {0} wezłów w {1} węzłów" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Cofnij" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Cofa ostatnią czynność." + +#: ../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 "Odznacz wszystko" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Odznacza wszystkie obiekty." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Odznacz wszystko (zaznaczenie)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Odznacz wszystko (anulowanie)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Zaktualizuj dane" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)" + +#. 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 "Odświeżanie danych" + +#: ../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 "Aktualizuj zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Wybrano zbiór pusty." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Wyślij do OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Wysyła wszystkie zmiany na serwer OSM." + +#: ../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 "Nie ma nic do wysłania. Wprowadź jakieś dane." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Brak zmian do wysłania." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Synchronizuj cały zestaw danych" + +#: ../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 "Wykryto 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 "niespodziewana wartość powrotna. Dostałem {0}" + +#: ../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 "Załadunek się nie powiódł.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Załadunek do API OSM się nie udał." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Powiększ" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zmniejsz" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Wstecz" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Wraca do wcześniej odtwarzanego fragmentu." + +#: ../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 "Szybciej" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Zwiększa prędkość odtwarzania." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Do przodu" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Przeskakuje do następnego fragmentu." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Następny znacznik" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Odtwórz następny znacznik." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Odtwórz / wstrzymaj" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Tworzenie węzłów i dróg." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Poprzedni znacznik" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Odtwórz poprzedni znacznik." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Wolniej" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Zmniejsza prędkość odtwarzania." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Pobieranie danych GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Pobrane dane GPX" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "czyste dane GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Pobieranie danych" + +#: ../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 "Nie zaimportowano danych." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "dane OpenSteetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Pobieranie {0} z {1} (pozostało: {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "The following errors occurred during mass download:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Błędy podczas pobierania" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Tryb kasowania" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Usuwanie węzłów lub dróg." + +#: ../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 "Tryb: {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 "" +"Kliknij aby usunąć. Shift: usuwa segment. Alt: nie usuwa węzłów przy " +"usuwaniu drogi. Ctrl: usuwa powiązane obiekty." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2225,18 +2068,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 "Zaznacz" -#: ../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 "Wybieranie, przesuwanie i obracanie obiektów" -#: ../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" @@ -2245,18 +2088,18 @@ 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 "Więcej elementów" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Przesuń je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Cofnij przesunięcie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2264,10 +2107,6 @@ "Really move them?" msgstr "" -"Przesunąłeś/ęłaś więcej niż {0} elementów.\n" -"Przesuwanie dużej liczby elementów jednocześnie jest zazwyczaj wynikiem " -"błędu.\n" -"na pewno tego chcesz?" - -#: ../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 "" @@ -2388,7 +2227,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - obiekt z podanym ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2439,41 +2277,41 @@ msgstr "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../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 "Nie znaleziono nic szukając ''{0}''" -#: ../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 "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../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 "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../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 "Znaleziono {0} pasujących." -#: ../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 "" @@ -2483,40 +2321,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 "" -#: ../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 "Brak argumentów dla operator lub." -#: ../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 "Brak argumentu dla operatora nie." -#: ../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 "Brak nawiasu zamykającego." -#: ../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 "" @@ -2525,5 +2363,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." @@ -2560,62 +2398,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Dodaj węzeł" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Dodaj {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relacje: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Zmień {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Zmień {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Zmień relację" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Usuń \"{0}\" dla {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Usuń \"{0}\" dla {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Usuń \"{0}\" dla {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Ustaw {0}={1} dla {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Ustaw {0}={1} dla {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Ustaw {0}={1} dla {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2686,34 +2524,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] "Usuń {0} {1}" -msgstr[1] "Usuń {0} {1}" -msgstr[2] "Usuń {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] "Tryb kasowania" -msgstr[1] "Tryb kasowania" -msgstr[2] "Tryb kasowania" +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] "Usuń {0} {1}" -msgstr[1] "Usuń {0} {1}" -msgstr[2] "Usuń {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] "Usuń z relacji" -msgstr[1] "Usuń z relacji" -msgstr[2] "Usuń z relacji" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2747,5 +2581,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." @@ -2826,17 +2660,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2846,17 +2680,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Rozwiąż {0} konfliktów w {1} obiektach" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3063,5 +2897,5 @@ msgstr "E" -#: ../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 @@ -3069,23 +2903,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 "parameter ''{0}'' nie może być pusty (null)" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Błąd: {0}" -#: ../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 "Uwaga: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "niespodziewana wartość powrotna. Dostałem {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "niespodziewana wartość powrotna. Dostałem {0}" + +#: ../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 @@ -3098,11 +2957,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 "" @@ -3153,9 +3017,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." @@ -3164,118 +3028,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 "Nieznana rola \"{0}\"." -#: ../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 "nieotagowany" -#: ../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 "tekst" @@ -3298,5 +3162,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" @@ -3308,5 +3172,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" @@ -3318,5 +3182,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" @@ -3395,7 +3259,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Nie mogę czytać pliku ''{0}''. Komunikat błędu:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3426,5 +3290,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "tory kolejowe" @@ -3458,127 +3322,33 @@ msgstr[2] "{0} elementów" -#: ../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 "nieznany" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Nieznany adres" -#: ../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 "" @@ -3789,5 +3559,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}" @@ -4164,4 +3934,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 @@ -4233,8 +4005,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 @@ -4357,5 +4129,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 "usunięto" @@ -4415,5 +4187,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 "" @@ -4455,4 +4227,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 @@ -4466,5 +4239,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 "" @@ -4570,4 +4343,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 "Brak konfliktów, które można pokazać" + +#: ../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 @@ -4580,24 +4389,23 @@ msgstr "wszystkie" -#: ../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 "Wybierz kolor" - -#: ../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}''" @@ -4605,7 +4413,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 "parameter ''{0}'' nie może być pusty (null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4618,14 +4426,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 "Jeszcze nie zaimplementowane." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4634,17 +4443,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "z drogi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Usuń z relacji" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikty podczas pobierania." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4670,24 +4476,8 @@ msgstr[2] "{0} relacji" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Zmiana rozdzielczości" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Rozwiąż konflikty" - -#: ../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 "Wklej" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4702,10 +4492,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} droga" -msgstr[1] "{0} drogi" -msgstr[2] "{0} dróg" +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 "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" + +#: ../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 "Miejsce" + +#: ../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 "Klucz:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Wartość" + +#: ../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 "Jednokierunkowa" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Wersja" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4732,5 +4586,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}" @@ -4761,5 +4615,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." @@ -4832,13 +4686,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 "Warstwa: {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 "Relacje: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4925,5 +4779,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 "" @@ -4983,5 +4837,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 "Dodaj" @@ -5031,5 +4885,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 "Relacje" @@ -5123,10 +4977,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[2] "Autor" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5139,7 +4992,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Więcej informacji na temat tej funkcji" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5220,5 +5072,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}" @@ -5236,9 +5088,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 "" @@ -5489,11 +5336,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 "" @@ -5507,7 +5354,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Ładowanie wczesnych wtyczek" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5633,5 +5479,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Miejsca" @@ -5712,5 +5558,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 "" @@ -5760,7 +5606,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Wyślij bieżące ustawienia na serwer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6643,52 +6488,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 "Nazwa" @@ -6698,21 +6543,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 "Zmień relację" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Więcej informacji na temat tej funkcji" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Ostatnia zmiana o {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6730,7 +6573,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nazwa ulicy" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6771,12 +6613,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Proszę wybierz wartość" +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 "parameter ''{0}'' nie może być pusty (null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6818,8 +6659,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6835,8 +6675,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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 "" @@ -6853,8 +6692,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6868,7 +6706,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Porzuć i wyjdź" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6881,7 +6718,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Zapisz i wyjdź" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6959,7 +6795,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Podczas wysyłania" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6968,12 +6803,141 @@ #: ../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 "Załadunek wszystkich zmian w jednym żądaniu." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Ustawienia" + +#: ../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 "Obiekty do dodania:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Obiekty do zmiany:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Obiekty do usunięcia:" + +#: ../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 "Wyślij zmiany" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Plik" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Czy wysłać te zmiany?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Wysyłanie" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Proszę podać nazwę lokalizacji." + +#: ../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 @@ -7214,5 +7178,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." @@ -7270,7 +7233,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Pobieranie danych" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7333,4 +7295,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 "" +"Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane " +"za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7526,5 +7497,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 "Proszę wybrać wiersz do usunięcia" @@ -7983,7 +7954,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Wyświetlaj ID obiektu na listach wyboru" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7998,7 +7968,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Wyświetlaj ID obiektu na listach wyboru" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8350,8 +8319,4 @@ msgstr "Zablokuj" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Klucz:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8408,5 +8373,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 @@ -8417,42 +8382,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Dodaj komentarz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Usuń zaznaczoną warstwę." - -#: ../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 "Więcej informacji na temat tej funkcji" #. 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 "Dodatkowe atrybuty:" -#: ../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 "Używa szablon \"{0}\" z grupy \"{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 "Używa szablon \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "zamknięta droga" -#: ../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 "Nieznany typ: {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 @@ -8463,15 +8426,15 @@ msgstr "Nie można odczytać źródła szablonów: {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 "Błąd podczas przetwarzania {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 "Elementy typu {0} nie są wspierane." -#: ../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 @@ -8482,18 +8445,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../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 "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Zmień właściwości" @@ -8520,5 +8483,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 "" @@ -8535,7 +8497,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 @@ -8613,5 +8572,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}" @@ -8619,5 +8578,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" @@ -8625,5 +8584,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" @@ -8644,6 +8602,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 @@ -8653,40 +8611,40 @@ msgstr "Pobieranie danych OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8748,10 +8706,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 "" @@ -8759,11 +8717,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 "Otwieranie zestawu zmian..." - -#: ../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}" @@ -8771,34 +8727,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 "Otwieranie zestawu zmian..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Otwieranie zestawu zmian..." - -#: ../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 "Otwieranie zestawu zmian..." - -#: ../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 " @@ -8806,44 +8746,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../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 "Zamykanie zestawu zmian..." - -#: ../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 "Otwieranie zestawu zmian..." - -#: ../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 "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../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}." @@ -8862,10 +8802,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 "" @@ -8923,6 +8863,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 "Pliki serwera OSM" @@ -8951,5 +8896,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 "" @@ -9006,74 +8951,139 @@ msgstr "Błąd parsowania danych" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Nieznana wersja" - -#: ../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 "Brak wymaganego atrybutu \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "Przekonwertowany z: {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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " nie posiada referencji" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Znaleziono tag w" - -#: ../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 "Niekompletny opis z 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 "Niedozwolony obiekt z 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 "Brak wymaganego atrybutu \"{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 "" @@ -9082,16 +9092,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 "Przygotowywanie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Zły format identyfikatora węzła" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Przygotowywanie danych OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Przygotowywanie danych..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9138,33 +9162,43 @@ "Internetem." -#: ../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} pozostało. Przesyłanie {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} pozostało. Przesyłanie {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} pozostało. Przesyłanie {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 "Wysyłanie..." + +#: ../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 "Nie ma nic do wysłania. Wprowadź jakieś dane." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9201,11 +9235,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 "" @@ -9218,4 +9247,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 @@ -9257,20 +9291,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 "Zablokuj wtyczkę" #: ../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 "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?" -#: ../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 " @@ -9280,5 +9314,9 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../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 "" @@ -9288,10 +9326,10 @@ "\"." -#: ../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 "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}." -#: ../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." @@ -9300,9 +9338,9 @@ "błędu." -#: ../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 "Czy ta wtyczka ma zostać zablokowana?" -#: ../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 " @@ -9312,13 +9350,13 @@ "wyładować wtyczkę." -#: ../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" @@ -9376,4 +9414,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 "nieznany" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9449,4 +9518,88 @@ msgstr "(Tekst już został skopiowany do schowka.)" +#: ../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 @@ -9517,5 +9670,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9524,5 +9677,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9531,5 +9684,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9538,5 +9691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9545,5 +9698,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9602,40 +9755,39 @@ msgstr "Wyślij ślady" -#: ../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 "Opis" -#: ../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}" @@ -9643,47 +9795,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 "Łączenie..." -#: ../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 "Błąd podczas wysyłania" -#: ../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 "Wysyłanie GPX zakończone sukcesem" -#: ../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 "Nie podano opisu. Proszę podać jakiś opis." -#: ../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 "Nie wybrano żadnej warstwy GPX. Nie można wysłać sladu." -#: ../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 "Nie podano nazwy użytkownika." -#: ../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 "Nie podano hasła." -#: ../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 "Wysyłanie śladu GPX" @@ -9898,5 +10050,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 "" @@ -9910,13 +10062,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 "" @@ -9925,9 +10077,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 "Nieprawidłowa strefa czasowa" -#: ../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 "" @@ -9936,65 +10088,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 "Ślad GPX wczytany" -#: ../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 " @@ -10002,13 +10154,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 "" @@ -10046,5 +10198,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 "Błąd podczas ładowania pliku" @@ -10073,11 +10225,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Nie znaleziono miejscowości {0} lub nie jest ona dostępna w WMS.\n" -"Proszę sprawdzić jej dostepność pod adresem www.gadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10093,13 +10243,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Kataster" -#: ../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" @@ -10108,13 +10258,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 "" @@ -10224,9 +10374,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 "" @@ -10379,7 +10529,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Zaznacz" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10464,5 +10613,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 "Pusta warstwa" @@ -11388,18 +11537,18 @@ msgstr "Nieznany stan problemu" -#: ../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}" @@ -11410,5 +11559,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11418,9 +11567,9 @@ "Ustawienia mapy w ustawieniach programu." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "opcje osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Ścieżka do programu Firefox" @@ -11431,28 +11580,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Utwórz nowy węzeł." + +#: ../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 " @@ -11461,28 +11615,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 "" @@ -11973,25 +12133,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Podaj wartości dla wszystkich konfliktów." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Rozwiąż konflikty" + #: ../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 "" @@ -12063,6 +12231,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 "Błędy poprawności" @@ -12072,10 +12240,10 @@ msgstr "Sprawdzanie poprawności przebiegło pomyślnie" -#: ../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 "Siatka" -#: ../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 "" @@ -12164,51 +12332,65 @@ msgstr "Przeprowadza sprawdzanie poprawności danych" -#: ../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 "Otwiera okno z informacją o rezultatach sprawdzania poprawności" -#: ../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 "Pokaż problem" -#: ../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 "Napraw" -#: ../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 "Napraw zaznaczone błędy." -#: ../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 "Zignoruj" -#: ../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 "Ignoruj wybrane błędy następnym razem." -#: ../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 "Całą grupę" -#: ../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 "Pojedyncze elementy" -#: ../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 "Nic" -#: ../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 "Odświeżanie danych" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12234,16 +12416,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Ten test sprawdza czy dwie drogi, tory lub szlaki wodne przecinają się na " -"tej samej warstwie ale nie są połączone węzłem." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Przecinające się drogi" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12251,19 +12429,18 @@ msgstr "Przecinające się drogi" -#: ../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 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Aktualizuj pozycję dla: " - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12271,7 +12448,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 "Powielone węzły drogi" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12282,7 +12458,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Powielone węzły drogi" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12810,5 +12985,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "Zeskanowana mapa..." #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -12848,5 +13023,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Wystąpił wyjątek" @@ -12930,5 +13105,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 " @@ -12936,5 +13111,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 "" @@ -12952,17 +13127,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 "" @@ -13005,19 +13180,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "dla wyznaczonych pojazdów" - -#: ../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 "" @@ -13028,110 +13202,121 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Nieprawidłowa data" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../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 "Zmiana rozdzielczości" -#: ../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 "Błędny format pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Ustawienia wtyczki WMS" -#: ../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 "Nazwa w menu" -#: ../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 "Adres serwera WMS" -#: ../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 "URL WMS (domyślny)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS" -#: ../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 "Powiększ do wybranych elementów" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Nakładające się obszary" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Proszę zaznaczyć co najmniej jedną drogę." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "północ" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13392,4 +13577,6 @@ "plugin is still under early development and may be buggy." msgstr "" +"Wspiera wczytywanie zeskanowany map ze strony walking-papers.org. Wtyczka ta " +"jest we wczesnej fazie rozwoju i może zawierać błędy." #. Plugin waydownloader @@ -13496,5 +13683,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 "Numer" @@ -14036,7 +14223,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "chata górska" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14057,8 +14243,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 "wypożyczalnia" +msgstr "" #. color heath @@ -14076,5 +14261,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 "Las naturalny" @@ -14087,7 +14273,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "bilety parkingowe" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14123,7 +14308,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "bruk" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14134,7 +14318,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "niekompletne" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14145,7 +14328,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "trawa" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14339,4 +14521,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" @@ -14365,12 +14548,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 "tak" #. color permissive -#. +#. #. 1 #. 40000 @@ -14418,5 +14601,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14453,5 +14636,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14515,6 +14698,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 "nie" @@ -14660,6 +14844,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 "Rodzaj" @@ -14930,7 +15114,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "ciąg pieszy" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14949,7 +15132,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Kolczatka" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15241,7 +15423,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 "Operator" @@ -15454,6 +15636,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 "Wysokość" @@ -16365,7 +16547,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" @@ -16413,23 +16592,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 "godziny otwarcia" @@ -16453,5 +16632,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" @@ -16498,22 +16676,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 "" @@ -16528,22 +16706,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 "" @@ -16558,22 +16736,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 "" @@ -16607,5 +16785,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 "Numer referencyjny" @@ -16625,7 +16803,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "parkuj i jedź" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16639,7 +16816,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Pojemność" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16649,12 +16825,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Miejsca dla niepełnosprawnych" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Miejsca dla niepełnosprawnych" +msgstr "" #: build/trans_presets.java:1400 @@ -16856,5 +17030,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "schronienie" @@ -17239,7 +17413,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "znak stop" +msgstr "" #. color tertiary @@ -17282,28 +17455,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chińska" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Pobierany obszar" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Wklej" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "miasto" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regionalna" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17331,7 +17499,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "szlak górski" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17345,7 +17512,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "bocznica" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17362,13 +17528,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "przejście graniczne" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "dla początkujących" +msgstr "" #: build/trans_presets.java:1737 @@ -17385,7 +17549,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "zagospodarowanie przestrzenne" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17396,19 +17559,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informacje" +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 "Opis symboli" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Dźwięk" +msgstr "" #. @@ -17419,7 +17579,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Numer telefonu" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17743,5 +17902,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17775,5 +17934,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18899,6 +19058,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 "Religia" @@ -18907,66 +19066,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 "bahaizm" -#: 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 "buddyzm" -#: 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 "chrześcijaństwo" -#: 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 "hinduizm" -#: 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 "dżinizm" -#: 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 "judaizm" -#: 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 "islam" -#: 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 "sikhizm" -#: 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 "spirytualizm" -#: 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 "taoizm" -#: 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 "zaratusztrianizm" -#: 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 "Wyznanie" @@ -18975,76 +19134,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 "kościół anglikański" -#: 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 "baptyści" -#: 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 "kościół katolicki" -#: 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 "ewangelikalizm" -#: 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 "świadkowie Jehowy" -#: 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 "luteranie" -#: 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 "metodyści" -#: 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 "mormoni" -#: 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 "kościół prawosławny" -#: 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 "zielonoświątkowcy" -#: 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 "prezbiterianie" -#: 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 "protestanci" -#: 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 "kwakrzy" -#: 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 "szyici" -#: 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 "sunnici" @@ -19376,5 +19535,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 "Uwagi" @@ -19399,5 +19558,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 "na monety" @@ -19405,5 +19564,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 "na banknoty" @@ -19411,5 +19570,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 "na karty chipowe" @@ -19417,5 +19576,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 "na karty debetowe" @@ -19423,5 +19582,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 "na karty kredytowe" @@ -19480,10 +19639,144 @@ msgstr "ławka" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Wstecz" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "miejsce pamięci" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "żadne" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Miejsce" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Kolor" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Wstecz" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "na dół" + +#. 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 "zielony" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "koniec" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Wartość" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "woda" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Ilość przewodów" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Ambona myśliwska" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Edycja ambony strzelniczej" @@ -19492,30 +19785,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 "Wysokość" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Ukryj" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Zablokuj" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "fontanna" @@ -19524,10 +19817,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Edycja fontanny" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "woda do picia" @@ -19536,10 +19829,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Edycja punktu z wodą pitną" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19547,35 +19840,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 "Sklepy" #. 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 "Edycja supermarketu" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "chata górska" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Edycja chaty górskiej" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "sklepik" @@ -19583,9 +19874,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Edycja sklepiku" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "kiosk" @@ -19593,29 +19884,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Edycja kiosku" -#: 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 "Edycja przystanku autobusowego" - -#: 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 "Edycja drzewa" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "automat sprzedający" @@ -19623,5 +19912,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Edycja automatu sprzedającego" @@ -19629,88 +19918,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Sprzedawane produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "bilety komunikacji miejskiej" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "mapy komunikacji miejskiej" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "bilety parkingowe" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "jedzenie" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "napoje" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "słodycze" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "papierosy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "zdjęcia" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "jedzenie dla zwierząt" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "gazety" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "zabawki" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "znaczki" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "karty SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "vouchery" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "prezerwatywy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampony" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "torby na odchody" #. 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 "rzeźnik" @@ -19718,9 +20007,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Edycja sklepu mięsnego" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "piekarnia" @@ -19728,9 +20017,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Edycja piekarni" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "florysta" @@ -19738,18 +20027,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Edycja kwiaciarni" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "naturalna żywność" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Edycja sklepu z naturalną żywnością" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "monopolowy" @@ -19757,54 +20046,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "napoje" #. 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 "komputery" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Edycja sklepu komputerowego" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "elektronika" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Edycja sklepu z elektroniką" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "sprzęt hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Edycja sklepu ze sprzętem hi-fi" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "meble" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Edycja sklepu meblowego" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "centrum ogrodnicze" @@ -19812,9 +20101,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Edycja centrum ogrodniczego" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19822,9 +20111,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "sklep DIY" @@ -19832,54 +20121,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Edycja sklepu DIY (zrób to sam)" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "artykuły biurowe" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Edycja sklepu z artykułami biurowymi" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "fryzjer" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Edycja salonu fryzjerskiego" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "obuwie" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Edycja sklepu obuwniczego" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "zabawki" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Edycja sklepu z zabawkami" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "pralnia chemiczna" @@ -19887,9 +20176,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Edycja palni chemicznej" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "pralnia samoobsługowa" @@ -19897,9 +20186,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "wyspa" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "sklep turystyczny" @@ -19907,32 +20196,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Edycja sklepu ze sprzętem turystycznym" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Edycja sklepu sportowego" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Edycja optyka" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Gotówka" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "bank" @@ -19940,14 +20229,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Edycja banku" -#: 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 "bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "kantor" @@ -19955,5 +20244,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Edycja kantoru" @@ -19961,15 +20250,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Edycja bankomatu" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Zdrowie" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "lekarz" @@ -19977,18 +20266,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Edycja lekarza" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "dentysta" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Edycja dentysty" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "apteka" @@ -19996,5 +20285,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Edycja apteki" @@ -20002,9 +20291,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "realizacja recept" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "szpital" @@ -20012,10 +20301,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Edycja szpitala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20024,5 +20313,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20031,20 +20320,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Numer punktu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Numer telefonu" #. 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 "(Podaj razem z kodem kraju, np.: +12-345-67890)" @@ -20052,5 +20341,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 "weterynarz" @@ -20059,55 +20348,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Edycja lecznicy weterynaryjnej" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "kontynent" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Edycja kontynentu" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "kraj" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Edycja kraju" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "stan" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Edycja stanu" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Edycja regionu" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "okręg" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Edycja okręgu / hrabstwa" @@ -20115,15 +20404,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "miasto" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Edycja miasta" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "miejscowość" @@ -20131,10 +20420,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Edycja miejscowości" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "dzielnica" @@ -20142,25 +20431,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Edycja dzielnicy" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "wieś" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Edycja wsi" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "wólka" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Edycja wólki" @@ -20168,5 +20457,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "okolica" @@ -20174,10 +20463,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Edycja okolicy" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "wyspa" @@ -20185,24 +20474,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Edycja wyspy" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "w lewo" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Edycja chaty górskiej" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "wejście do jaskini" @@ -20210,10 +20497,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Edycja wejścia do jaskini" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "wzgórze" @@ -20221,10 +20508,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Edycja wzgórza" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "lodowiec" @@ -20232,10 +20519,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Edycja lodowca" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "wulkan" @@ -20243,70 +20530,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Edycja wulkanu" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Granice" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "narodowa" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Edycja granicy narodowej" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "administracyjna" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Edycja granicy administracyjnej" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Edycja granicy politycznej" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "park narodowy" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Edycja granicy parku narodowego" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Zagospodarowanie terenu" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "drzewo" @@ -20315,15 +20602,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Edycja drzewa" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Nazwa systematyczna" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "las" @@ -20332,5 +20619,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Edycja lasu" @@ -20338,17 +20625,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 "iglasty" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "liściasty" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "mieszany" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "las" @@ -20357,14 +20644,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Edycja lasu" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "rezerwat przyrody" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Edycja rezerwatu przyrody" @@ -20372,25 +20659,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "rumowisko" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Edycja rumowiska" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "busz" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Edycja buszu" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "turnia" @@ -20398,10 +20685,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Edycja turni" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "wrzosowisko" @@ -20409,5 +20696,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Edycja wrzosowiska" @@ -20415,5 +20702,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "zagroda" @@ -20422,45 +20709,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Edycja zagrody" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "grunty rolne" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Edycja gruntów rolnych" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "łąka" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Edycja łąki" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "winnica" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Edycja winnicy" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "ogródki działkowe" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Edycja ogródków działkowych" @@ -20468,25 +20755,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "ogród" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Edycja ogrodu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Trawa" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20494,10 +20781,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "miejsce publiczne" @@ -20505,20 +20792,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Edycja miejsca publicznego" #. 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 "Edycja parku" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Teren rekreacyjny" @@ -20526,5 +20813,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Edycja terenu rekreacyjnego" @@ -20532,15 +20819,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "zabudowa mieszkaniowa" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Edycja zabudowy mieszkaniowej" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "cmentarz" @@ -20548,9 +20835,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "cmentarz" @@ -20558,39 +20845,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "handel" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Edycja obszaru handlowego" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "biura i usługi" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Edycja obszaru biur i usług" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "teren przemysłowy" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Edycja terenu przemysłowego" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "teren kolejowy" @@ -20598,15 +20885,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Edycja terenu kolejowego" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "obszar wojskowy" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Edycja obszaru wojskowego" @@ -20614,55 +20901,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "budowa" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Edycja terenu budowy" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "teren pod zabudowę" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Edycja terenu pod zabudowę" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "wysypisko" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Edycja wysypiska śmieci" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "kamieniołom" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Edycja komieniołomu" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20672,5 +20959,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 "" @@ -20679,10 +20966,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "zewnętrzny segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "wewnętrzny segment" @@ -20690,5 +20977,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "ograniczenia skrętu" @@ -20697,5 +20984,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Edycja ograniczenia skrętu" @@ -20703,34 +20990,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Ograniczenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "brak skrętu w lewo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "brak skrętu w prawo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "zakaz jazdy prosto" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "zakaz zawracania" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "nakaz skrętu w prawo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "nakaz skrętu w lewo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "nakaz jazdy prosto" @@ -20739,15 +21026,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "z drogi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "przez węzeł lub drogę" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "do drogi" @@ -20755,5 +21042,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Trasa" @@ -20762,5 +21049,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Edytuj trasę" @@ -20768,5 +21055,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Typ trasy" @@ -20774,5 +21061,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20838,5 +21125,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 @@ -20845,17 +21132,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "droga" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "prom" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20908,5 +21195,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 @@ -20915,13 +21202,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tramway" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "objazd" @@ -20935,10 +21222,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Opis symboli" @@ -20946,31 +21233,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Sieć" #. 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 "proponowany" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternatywny" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "tymczasowy" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "połaczenie" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Kolor (hex)" @@ -20979,30 +21266,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24155,76 +24442,4 @@ msgstr "historia" -#. 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 "zielony" - #. color green #. @@ -25156,5 +25371,5 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? @@ -25192,105 +25407,101 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Wszystkie trasy są puste" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Czy scalić węzły z różnych relacji?" + +#~ msgid "Merge Anyway" +#~ msgstr "Scal mimo tego" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check " -#~ "conditions for no layer\"." +#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." + +#~ msgid "Unknown version" +#~ msgstr "Nieznana wersja" + +#~ msgid " has zero ref" +#~ msgstr " nie posiada referencji" + +#~ msgid "Found element in non-relation." +#~ msgstr "Znaleziono tag w" + +#~ msgid "Ill-formed node id" +#~ msgstr "Zły format identyfikatora węzła" + +#~ msgid "Move" +#~ msgstr "Przenieś" #~ msgid "No document open so nothing to save." #~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." +#~ msgid "Unknown file extension." +#~ msgstr "Nieznane rozszerzenie pliku." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Object" +#~ msgstr "Obiekt" + +#~ msgid "true" +#~ msgstr "prawda" + +#~ msgid "false" +#~ msgstr "fałsz" + +#~ msgid "Change" +#~ msgstr "Zmień" + +#~ msgid "unnamed" +#~ msgstr "bez nazwy" + +#~ msgid "Data Layer" +#~ msgstr "Warstwa danych" + +#~ msgid "my version:" +#~ msgstr "moja wersja:" + +#~ msgid "their version:" +#~ msgstr "ich wersja:" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nie można połączyć się z serwerem." + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "Revert" +#~ msgstr "Wycofaj" + +#~ msgid "OSM username (email)" +#~ msgstr "Użytkownik OSM (email)" + +#~ msgid "position" +#~ msgstr "pozycja" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + #~ msgid "Delete {1} {0}" #~ msgstr "Usuń {1} {0}" -#~ msgid "Delete Layer" -#~ msgstr "Usuń warstwę" - -#~ msgid "Authors: {0}" -#~ msgstr "Autorzy: {0}" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "citymap" -#~ msgstr "mapa miasta" - -#~ msgid "hikingmap" -#~ msgstr "mapa tras pieszych" - -#~ msgid "bicyclemap" -#~ msgstr "mapa tras rowerowych" - -#~ msgid "Board Type" -#~ msgstr "Rodzaj tablicy" - -#~ msgid "board" -#~ msgstr "tablica informacyjna" - -#~ msgid "Move" -#~ msgstr "Przenieś" - -#~ msgid "Unknown file extension." -#~ msgstr "Nieznane rozszerzenie pliku." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Object" -#~ msgstr "Obiekt" - -#~ msgid "true" -#~ msgstr "prawda" - -#~ msgid "false" -#~ msgstr "fałsz" - -#~ msgid "Change" -#~ msgstr "Zmień" - -#~ msgid "unnamed" -#~ msgstr "bez nazwy" - -#~ msgid "Data Layer" -#~ msgstr "Warstwa danych" - -#~ msgid "my version:" -#~ msgstr "moja wersja:" - -#~ msgid "their version:" -#~ msgstr "ich wersja:" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nie można połączyć się z serwerem." - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "Revert" -#~ msgstr "Wycofaj" - -#~ msgid "OSM username (email)" -#~ msgstr "Użytkownik OSM (email)" - -#~ msgid "position" -#~ msgstr "pozycja" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - #~ msgid "Validate" #~ msgstr "Zweryfikuj" - -#~ msgid "end" -#~ msgstr "koniec" #~ msgid "Charge" @@ -25380,7 +25591,14 @@ #~ "Proszę nie wysyłać żadnych danych po tej wiadomości." +#~ msgid "map" +#~ msgstr "mapa" + #~ msgid "Drawbridge" #~ msgstr "Most zwodzony" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer." + #~ msgid "Error deleting plugin file: {0}" #~ msgstr "Błąd podczas usuwania wtyczki: {0}" @@ -25391,4 +25609,7 @@ #~ msgid "Layers: {0}" #~ msgstr "Warstwy: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autorzy: {0}" #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -25428,4 +25649,8 @@ #~ msgstr "Niektóre z węzłów są (prawie) w jednej linii" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać." @@ -25439,4 +25664,13 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "citymap" +#~ msgstr "mapa miasta" + +#~ msgid "hikingmap" +#~ msgstr "mapa tras pieszych" + +#~ msgid "bicyclemap" +#~ msgstr "mapa tras rowerowych" #~ msgid "Validate either current selection or complete dataset." @@ -25453,4 +25687,7 @@ #~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych" +#~ msgid "board" +#~ msgstr "tablica informacyjna" + #~ msgid "Remove Selected" #~ msgstr "Usuń zaznaczone" @@ -25459,4 +25696,7 @@ #~ msgstr "Podstawowe" +#~ msgid "Delete Layer" +#~ msgstr "Usuń warstwę" + #~ msgid "sports" #~ msgstr "Sklep sportowy" @@ -25482,7 +25722,4 @@ #~ msgid "Move Down" #~ msgstr "Przesuń w dół" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" #~ msgid "Tagging preset source" @@ -25529,4 +25766,7 @@ #~ msgstr "Usuń i pobierz" +#~ msgid "Board Type" +#~ msgstr "Rodzaj tablicy" + #~ msgid "" #~ "No data to update found. Have you already opened or downloaded a data " @@ -25537,4 +25777,11 @@ #~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check " +#~ "conditions for no layer\"." + +#~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 17594) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 17595) @@ -8,7 +8,7 @@ "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-18 14:12+0000\n" -"Last-Translator: Maurorjb \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-10 02:03+0000\n" +"Last-Translator: Skippern \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\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:37+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 "Ajuda" -#: ../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 "A projeção {0} nâo pode ser ativada. Usando Mercator" -#: ../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 "Erro" -#: ../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] "Existem modificações não-salvas. Descartar alterações e continuar?" -msgstr[1] "Existem modificações não-salvas. Descartar alterações e continuar?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Alterações Não Salvas" -#: ../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 "Salvar e Sair" -#: ../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 "Descartar e Sair" -#: ../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 "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL malformada: \"{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,15 +244,17 @@ msgstr "Aviso" -#: ../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 "Ignorando arquivo malformado: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Não foi possível ler arquivo ''{0}''. O erro é:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -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 "Extensões" @@ -352,22 +354,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"AVISO: formato inesperado de URL de base do API. O redirecionamento para a " -"página de histórico de primitiva do OSM provavelmente não funcionará. A URL " -"de base do API é: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"AVISO: formato inesperado de URL de base do API. O redirecionamento para a " -"página de histórico de primitiva do OSM provavelmente não funcionará. A URL " -"de base do API é: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -478,9 +474,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 @@ -514,6 +510,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 @@ -532,11 +528,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 "Informações" @@ -558,5 +554,5 @@ msgstr "Por favor, selecione no mínimo 3 nós." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -567,10 +563,10 @@ "número atual é {0}, o máximo é {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 "Violação de Capacidades da API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -581,5 +577,5 @@ "deletada {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -590,9 +586,9 @@ "máximo permitido de {2}. O tamanho é {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Violação de Précondição" -#: ../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}" @@ -648,77 +644,61 @@ msgstr "Não há conflitos para se aproximar" -#: ../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 "Combinar Caminhos" -#: ../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 "Combinar vários caminho em um só" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Combinar caminhos com membros diferentes?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Combinar assim mesmo" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"Os caminhos selecionados têm filiações diferentes. Você pretende uni-los " +"mesmo assim?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Inverter direções?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Inverter e Combinar" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter " +"algum destes?" + +#: ../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 "" +"No foi possível combinar os caminhos (Eles podem não estar unidos em um " +"único conjunto de nós)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Combinar {0} caminhos" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Por favor selecione no mínimo 2 caminhos a combinar" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Combinar caminhos com membros diferentes?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Combinar assim mesmo" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Os caminhos selecionados têm filiações diferentes. Você pretende uni-los " -"mesmo assim?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Inverter direções?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Inverter e Combinar" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter " -"algum destes?" - -#: ../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 "Entrada de valores para todos conflitos" - -#: ../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 "Resolver conflitos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Combinar {0} caminhos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Todos caminhos estavam vazios" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"No foi possível combinar os caminhos (Eles podem não estar unidos em um " -"único conjunto de nós)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -774,5 +754,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 "Excluir" @@ -782,15 +762,15 @@ msgstr "Excluir os objetos selecionados." -#: ../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 "Sobrescrever" -#: ../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 "O arquivo já existe. Sobrescrever?" @@ -819,10 +799,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}" @@ -839,5 +819,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." -msgstr "" +msgstr "Baixando referencias desde OSM..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 @@ -854,5 +834,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 @@ -895,7 +875,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Todas as imagens" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1033,1070 +1012,25 @@ msgstr "Combinar camada atual em outra camada" -#: ../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 "Unir Nós" -#: ../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 "Unir nós no mais antigo" -#: ../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 "Por favor selecione no mínimo dois nós para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Unir nós com usuários diferentes?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Unir mesmo assim" - -#: ../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 "" -"Os nós selecionados tem relações de usuários diferentes. Você ainda pretende " -"uni-los?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Unir {0} nós" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Combinar seleção" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Combinar primitivas selecionadas atualmente em outra camada" - -#: ../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 "Espelhar" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Espelhar os nós e caminhos selecionados." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Por favor selecione ao menos um nó ou caminho." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "acima" - -#: ../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 "Mover objetos {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "abaixo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "esquerda" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "direita" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Mover {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Move Objetos {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 "Não é possível mover objetos para fora do planeta." - -#: ../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 "Novo" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Criar novo mapa." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Abrir..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Abrir um arquivo." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Abrir um arquivo." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Regra desconhecida \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Abrir Local..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Abrir uma URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Separar camadas" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Digitar URL para baixar:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Transferir Local" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "URL para baixar" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Ortogonalizar prancha" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Somente dois nós permitidos" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Seleção deve consistir em somente dois caminhos" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós." - -#: ../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 "Somente um nó selecionado" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ortogonalizar" - -#: ../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 "Colar" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Colar conteúdo da memória" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Colar Tags" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Aplicar tags de conteúdo da memória de transferência em todos itens " -"selecionados." - -#: ../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] "Desfazendo exclusão de {0} primitivas" -msgstr[1] "Desfazendo exclusão de {0} primitivas" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferências..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Abrir uma página de preferências para configurações globais" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferências" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Refazer" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Refazer a última ação não terminada." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Renomear camada" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Também renomear o arquivo" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Não foi possível renomear arquivo ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Reverter Caminhos" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Reverter a direção de todos caminhos selecionados." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Favor selecionar no mínimo um caminho." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Reverter caminhos" - -#: ../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 "Salvar" - -#: ../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 "Salvar dados atuais" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Arquivo {0} já existe. Substituí-lo?" - -#: ../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 "Documento vazio" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "O documento não contém dados." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Salvar mesmo assim" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflitos" - -#: ../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 "" -"Existem conflitos não resolvidos. Os conflitos não serão salvos e tratados " -"se você rejeitar todos. Continuar?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Rejeitar Conflitos e Salvar" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Salvar arquivo OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Salvar arquivo GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Salvar Camada" - -#: ../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 "Salvar como..." - -#: ../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 "Salvar os dados atuais para um novo arquivo." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Selecionar Tudo" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Selecionar todos objetos não deletados na camada de dados. Isso seleciona " -"objetos incompletos também." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Mostrar relatório atual" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Ajuda: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Relatório Atual" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Copiar para área de transferência e fechar" - -#: ../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 "Fechar" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Dividir Caminho" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Dividir caminho no nó selecionado" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "A seleção atual não pode ser usada para divisões" - -#: ../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] "O nó selecionado não se encontra no meio de nenhum caminho" -msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho" - -#: ../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] "" -"Há mais de um caminho usando o nó que foi selecionado. Favor selecionar o " -"caminho também." -msgstr[1] "" -"Há mais de um caminho usando os nós que foram selecionados. Favor selecionar " -"o caminho também." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Os nós selecionados não compartilham o mesmo caminho." - -#: ../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] "O caminho selecionado não contém o nó selecionado." -msgstr[1] "O caminho selecionado não contém todos nós selecionados." - -#: ../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 "" -"Você precisa selecionar dois ou mais nós para dividir um caminho circular." - -#: ../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 "" -"O caminho não pode ser dividido nos nós selecionados. (Dica: Selecione nós " -"no meio do caminho.)" - -#: ../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 "Dividir caminho {0} em {1} partes" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Fechando conjunto de mudanças..." - -#: ../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 "Fechando conjunto de mudanças..." - -#: ../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 "Abrindo conjunto de mudanças..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Fechando conjunto de mudanças..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Alternar linhas GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Desenhar linhas entre pontos provenientes do gps" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Mudar a configuração global \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Desgrudar caminhos" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplicar nós que são usados em caminhos múltiplos" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Este nó não esta grudado a nada." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Nenhum destes nós está grudado a algo." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Nenhum dos nós destes caminhos está grudado a algo." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "A seleção atual não pode ser usada para desgrudar" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Selecione entre:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Um nó comentado, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Um nó que é usado em mais de um caminho, ou" - -#: ../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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou" - -#: ../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 "" -"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" - -#: ../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 "" -"* Um caminho e um ou mais de seus nós que são usados por mais de um caminho." - -#: ../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 "" -"Nota: Se um caminho é selecionado, este caminho receberá cópias recentes dos " -"nós não grudados\n" -"e os nós novos estarão selecionados. Caso contrário, todos os caminhos terão " -"sua própria\n" -"cópia e todos os nós serão selecionados." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nó não grudado" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplicar em {0} nós" - -#. 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 "Duplicar {0} nós em {1} nós" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Desfazer" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Desfazer última ação." - -#: ../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 "Desmarcar todos" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Desmarcar todos objetos" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Desmarcar tudo (Focar)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Desmarcar tudo (Sair)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Atualizar Dados" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" -"Atualiza os dados da camada atual a partir do servidor (recarrega dados)" - -#. 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 "Enviando dados" - -#: ../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 "Atualizar Seleção" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Atualiza as primitivas selecionadas a partir do servidor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Não há primitivas selecionadas para atualizar." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Seleção vazia" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Enviar para o OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Enviar todas as modificações ao servidor OSM." - -#: ../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 "Há conflitos não resolvidos. Você deve resolvê-los primeiro." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Não há nada a enviar. Baixe dados primeiro." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Não há modificações a enviar." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Sincronizar {0} {1} apenas" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Synchronizar todo o conjunto de dados" - -#: ../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 "" -"Envio falhou porque o servidor tem uma nova versão de " -"um
de seus nós, caminhos ou relações.
Este conflito é causado por " -"{0} com id {1},
o servidor tem a versão " -"{2}, e sua versão é {3}.

Clique {4} para sincronizar " -"somente a primitiva conflitante.
Clique {5} para " -"sincronizar todo o conjunto de dados locais no servidor
Clique {6}" -" para abortar e continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Detectado conflito" - -#. 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 "valor não esperado de retorno. Veio {0}" - -#: ../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 "" -"Envio falhou porque o servidor tem uma nova versão de " -"um
de seus nós, caminhos ou relações..

Clique {0} para sincronizar todos o conjuntos de dados locais com o servidor." -"
Clique {1} para abortar e continuar editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Envio falhou.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Envio para API OSM falhou" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Atualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Enviar estas modificações?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Enviar Modificações" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Editar nova relação na camada''{0}''" - -#: ../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 "Adicionar um novo nó a um caminho existente" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "enviar todas modificações em um pedido" - -#: ../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 "" -"Habilitar para envio de todas modificações em uma chamada, desabilitar para " -"usar uma chamada por primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Faça um comentário breve sobre as mudanças que está enviando:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Configuração de Som" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "conjunto de mudanças" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objetos a adicionar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objetos a modificar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objetos a excluir:" - -#: ../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] "Objetos a adicionar:" -msgstr[1] "Objetos a adicionar:" - -#: ../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] "Objetos a modificar:" -msgstr[1] "Objetos a modificar:" - -#: ../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] "Objetos a excluir:" -msgstr[1] "Objetos a excluir:" - -#: ../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 "Última modificação em {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Aproximar" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Afastar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Voltar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Pular de volta." - -#: ../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 "Áudio: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Mais rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Avanço Rápido" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Avançar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Pular a frente" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Próximo Marcador" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Reproduzir marcador seguinte." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Tocar/Pausar" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Tocar/pausar áudio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Marcar Anterior" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Tocar marcador prévio." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Lento" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Avanço Lento" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Baixando dados do GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Dados GPX baixados" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Dados GPS brutos" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Baixando dados" - -#: ../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 "Não há dados importados." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Dados OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Baixando {0} de {1} (faltam {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Erros ao Transferir" - -#: ../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 "" -"Existem {0} primitivas no seu conjunto de dados local que
podem ter " -"sido apagadas do servidor. Se você posteriormente tentar exclui-las " -"ou
atualizá-las no servidor provavelmente o servidor apontará " -"um
conflito.

Clique {1} para verificar o estado " -"dessas primitivas
no servidor.
Clique {2} para " -"ignorar.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Primitivas deletadas ou movidas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Apagar Modo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Apagar nós ou caminhos." - -#: ../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 "Modo: {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 "" -"Clique para apagar. Shift: apaga segmento de caminho. Alt: não apaga nós não " -"usados ao apagar um caminho. Ctrl: apaga objetos referentes." - +#: ../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 @@ -2107,7 +1041,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 @@ -2116,6 +1051,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 @@ -2146,4 +1081,916 @@ msgstr "parâmetro ''{0}'' não pode ser nulo" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Unir {0} nós" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Combinar seleção" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Combinar primitivas selecionadas atualmente em outra camada" + +#: ../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 "Espelhar" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Espelhar os nós e caminhos selecionados." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Por favor selecione ao menos um nó ou caminho." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "acima" + +#: ../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 "Mover objetos {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "abaixo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "esquerda" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "direita" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Mover {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Move Objetos {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 "Não é possível mover objetos para fora do planeta." + +#: ../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 "Novo" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Criar novo mapa." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Abrir..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Abrir um arquivo." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Abrendo arquivos" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Abrendo arquivo \"{0}\" ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Abrir Local..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Abrir uma URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Separar camadas" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Digitar URL para baixar:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Transferir Local" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "URL para baixar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Ortogonalizar prancha" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Somente dois nós permitidos" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Seleção deve consistir em somente dois caminhos" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós." + +#: ../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 "" +"Você está usando a EPSG: 4326 projeção que poderá conduzir a " +"resultados indesejáveis quando
fazendo alinhamnentos retangular .
" +"Mude sua projeção para se livrar do presente aviso.
Quer continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Somente um nó selecionado" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ortogonalizar" + +#: ../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 "Colar" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Colar conteúdo da memória" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Colar Tags" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Aplicar tags de conteúdo da memória de transferência em todos itens " +"selecionados." + +#: ../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 "Preferências..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Abrir uma página de preferências para configurações globais" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferências" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Refazer" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Refazer a última ação não terminada." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Renomear camada" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Também renomear o arquivo" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Não foi possível renomear arquivo ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Reverter Caminhos" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Reverter a direção de todos caminhos selecionados." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Favor selecionar no mínimo um caminho." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Reverter caminhos" + +#: ../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 "Salvar" + +#: ../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 "Salvar dados atuais" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Arquivo {0} já existe. Substituí-lo?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Nenhum exportador encontrado! Nada guardado." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Documento vazio" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Salvar mesmo assim" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "O documento não contém dados." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflitos" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Rejeitar Conflitos e Salvar" + +#: ../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 "" +"Existem conflitos não resolvidos. Os conflitos não serão salvos e tratados " +"se você rejeitar todos. Continuar?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Salvar arquivo OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Salvar arquivo GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Salvar Camada" + +#: ../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 "Salvar como..." + +#: ../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 "Salvar os dados atuais para um novo arquivo." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Selecionar Tudo" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Selecionar todos objetos não deletados na camada de dados. Isso seleciona " +"objetos incompletos também." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Mostrar relatório atual" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Ajuda: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Relatório Atual" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Copiar para área de transferência e fechar" + +#: ../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 "Fechar" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Dividir Caminho" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Dividir caminho no nó selecionado" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "A seleção atual não pode ser usada para divisões" + +#: ../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] "O nó selecionado não se encontra no meio de nenhum caminho" +msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho" + +#: ../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] "" +"Há mais de um caminho usando o nó que foi selecionado. Favor selecionar o " +"caminho também." +msgstr[1] "" +"Há mais de um caminho usando os nós que foram selecionados. Favor selecionar " +"o caminho também." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Os nós selecionados não compartilham o mesmo caminho." + +#: ../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] "O caminho selecionado não contém o nó selecionado." +msgstr[1] "O caminho selecionado não contém todos nós selecionados." + +#: ../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 "" +"Você precisa selecionar dois ou mais nós para dividir um caminho circular." + +#: ../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 "" +"O caminho não pode ser dividido nos nós selecionados. (Dica: Selecione nós " +"no meio do caminho.)" + +#: ../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 "Dividir caminho {0} em {1} partes" + +#: ../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 "Alternar linhas GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Desenhar linhas entre pontos provenientes do gps" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Mudar a configuração global \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Desgrudar caminhos" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplicar nós que são usados em caminhos múltiplos" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Este nó não esta grudado a nada." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Nenhum destes nós está grudado a algo." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Nenhum dos nós destes caminhos está grudado a algo." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "A seleção atual não pode ser usada para desgrudar" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Selecione entre:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Um nó comentado, ou" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Um nó que é usado em mais de um caminho, ou" + +#: ../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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou" + +#: ../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 "" +"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou" + +#: ../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 "" +"* Um caminho e um ou mais de seus nós que são usados por mais de um caminho." + +#: ../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 "" +"Nota: Se um caminho é selecionado, este caminho receberá cópias recentes dos " +"nós não grudados\n" +"e os nós novos estarão selecionados. Caso contrário, todos os caminhos terão " +"sua própria\n" +"cópia e todos os nós serão selecionados." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nó não grudado" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplicar em {0} nós" + +#. 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 "Duplicar {0} nós em {1} nós" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Desfazer" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Desfazer última ação." + +#: ../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 "Desmarcar todos" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Desmarcar todos objetos" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Desmarcar tudo (Focar)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Desmarcar tudo (Sair)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Atualizar Dados" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" +"Atualiza os dados da camada atual a partir do servidor (recarrega dados)" + +#. 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 "Enviando dados" + +#: ../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 "Atualizar Seleção" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Atualiza as primitivas selecionadas a partir do servidor" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Não há primitivas selecionadas para atualizar." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Seleção vazia" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Enviar para o OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Enviar todas as modificações ao servidor OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Não há camadas em que a camada
''{0}''
possa ser combinada." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Não há nada a enviar. Baixe dados primeiro." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Não há modificações a enviar." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Sincronizar {0} {1} apenas" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Synchronizar todo o conjunto de dados" + +#: ../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 "" +"Envio falhou porque o servidor tem uma nova versão de " +"um
de seus nós, caminhos ou relações.
Este conflito é causado por " +"{0} com id {1},
o servidor tem a versão " +"{2}, e sua versão é {3}.

Clique {4} para sincronizar " +"somente a primitiva conflitante.
Clique {5} para " +"sincronizar todo o conjunto de dados locais no servidor
Clique {6}" +" para abortar e continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Detectado conflito" + +#. 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 "valor não esperado de retorno. Veio {0}" + +#: ../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 "" +"Envio falhou porque o servidor tem uma nova versão de " +"um
de seus nós, caminhos ou relações..

Clique {0} para sincronizar todos o conjuntos de dados locais com o servidor." +"
Clique {1} para abortar e continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Envio falhou.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Envio para API OSM falhou" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Atualizando primitiva" + +#: ../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 "Aproximar" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Afastar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Voltar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Pular de volta." + +#: ../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 "Áudio: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Mais rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Avanço Rápido" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Avançar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Pular a frente" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Próximo Marcador" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Reproduzir marcador seguinte." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Tocar/Pausar" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Tocar/pausar áudio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Marcar Anterior" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Tocar marcador prévio." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Lento" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Avanço Lento" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Baixando dados do GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Dados GPX baixados" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Dados GPS brutos" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Baixando dados" + +#: ../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 "Não há dados importados." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Dados OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Baixando {0} de {1} (faltam {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Erros ao Transferir" + +#: ../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 "" +"Existem {0} primitivas no seu conjunto de dados local que
podem ter " +"sido apagadas do servidor. Se você posteriormente tentar exclui-las " +"ou
atualizá-las no servidor provavelmente o servidor apontará " +"um
conflito.

Clique {1} para verificar o estado " +"dessas primitivas
no servidor.
Clique {2} para " +"ignorar.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Primitivas deletadas ou movidas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Apagar Modo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Apagar nós ou caminhos." + +#: ../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 "Modo: {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 "" +"Clique para apagar. Shift: apaga segmento de caminho. Alt: não apaga nós não " +"usados ao apagar um caminho. Ctrl: apaga objetos referentes." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2259,18 +2106,18 @@ "áudio dali. SHIFT+soltar para sincronizar o áudio naquele ponto." -#: ../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 "Selecionar" -#: ../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 "Selecionar, mover e girar objetos" -#: ../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" @@ -2279,18 +2126,18 @@ msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Mova-os" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Desfazer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2298,9 +2145,6 @@ "Really move them?" msgstr "" -"Você moveu mais do que {0} elementos. Mover um grande número de elementos " -"quase sempre é um erro.\n" -"Quer realmente movê-los?" - -#: ../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 "" @@ -2424,7 +2268,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objetos com um ID determinado" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2478,41 +2321,41 @@ msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../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 "Não há valores coincidentes para ''{0}''" -#: ../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 "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../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 "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../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 "Encontrados {0} resultados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2526,5 +2369,5 @@ "{2}" -#: ../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 "" @@ -2532,10 +2375,10 @@ "chave=valor" -#: ../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" @@ -2544,26 +2387,26 @@ "ou relação." -#: ../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 "Credencial de autenticação inesperada: {0}" -#: ../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 "Faltam argumentos para \"or\"" -#: ../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 "Falta argumento para \"not\"" -#: ../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 "Fechamento de parenteses esperado." -#: ../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 "Número de parametros incorreto para operador de nós." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2574,5 +2417,5 @@ "de nós ou um intervalo, por exemplos, os nós:10-20" -#: ../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." @@ -2609,62 +2452,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Adicionar nó" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Somar {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Editar relação #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Mudar {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Mudar {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Modificar relação" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Remover \"{0}\" para {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Remover \"{0}\" para {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Remover \"{0}\" para {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Definir {0}={1} para {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Definir {0}={1} para {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Definir {0}={1} para {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2714,5 +2557,5 @@ #, java-format msgid "Add conflict for ''{0}''" -msgstr "" +msgstr "Adicionar conflito para \"{0}\"" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2736,30 +2579,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] "Apagar {1} {0}" -msgstr[1] "Apagar {1} {0}" +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] "Apagar Modo" -msgstr[1] "Apagar Modo" +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] "Apagar {1} {0}" -msgstr[1] "Apagar {1} {0}" +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] "Deletar da relação" -msgstr[1] "Deletar da relação" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2773,20 +2616,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Seleção \"{0}\" é usada pela relação \"{1}\" com a regra {2}.\n" -"Apagar da relação?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Seleção \"{0}\" é usada pela relação \"{1}\".\n" -"Apagar da relação?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2797,5 +2636,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." @@ -2878,17 +2717,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Resolver {0} conflito de tag em {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Resolver {0} conflito de tag em {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Resolver {0} conflito de tag em {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2898,17 +2737,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Resolver conflitos de versão para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Resolver conflitos de versão para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Resolver conflitos de versão para {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2998,11 +2837,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." msgstr "" -"Falha ao difinir referência. Versão de referência {0} dnão disponível no " -"histórico" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3048,11 +2885,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." msgstr "" -"O arquivo de preferência tinha erros. Fazendo cópia de segurança da versão " -"antiga em {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3119,5 +2954,5 @@ msgstr "L" -#: ../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 @@ -3125,22 +2960,47 @@ 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 "parametro {0} > 0 necessário. Obtido {1}." -#: ../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 "parâmetro ''{0}'' não pode ser nulo" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Regra não aplicável ''{0}'' para Way ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../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 "Aviso: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "indice inesperado na coluna. Obtido {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Credencial de autenticação inesperada: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Credencial de autenticação inesperada: {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3154,11 +3014,16 @@ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''" -#: ../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 "" @@ -3213,9 +3078,9 @@ msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}" -#: ../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 "Caminho para Estilo de Área não está fechado." -#: ../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." @@ -3224,118 +3089,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 "Membro vazio na relação." -#: ../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 "Apagado membro ''{0}'' na relação." -#: ../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 "Way ''{0}'' com menos de dois pontos." -#: ../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 "Mais de um caminho \"de\" encontrado." -#: ../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 "Mais de um caminho \"para\" encontrado." -#: ../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 "Encontrado mais de um parâmetro \"via\"." -#: ../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 "Regra desconhecida \"{0}\"." -#: ../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 "Tipo de membro desconhecido para \"{0}\"." -#: ../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 "Nenhum caminho \"de\" encontrado." -#: ../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 "Nenhuma caminho \"para\" encontrado." -#: ../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 "Não encontrei nenum nó ou caminho com o parâmetro \"via\"." -#: ../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 "O caminho \"de\" não começa ou termina em um nó \"via\"." -#: ../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 "O trecho \"to\" não começa ou termina no nó \"via\"" -#: ../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 "O trecho \"from\" não começa ou termina no caminho \"via\"" -#: ../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 "O trecho \"to\" não começa ou termina em um nó \"via\"." -#: ../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 "Estilo para restrição {0} não encontrado." -#: ../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 "Regra não aplicável ''{0}'' para Way ''{1}''." -#: ../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 "\"{0}\" não é um caminho no multipolígono." -#: ../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 "Não há via externa no multipolígono \"{0}\"." -#: ../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 "Interseção entre as vias \"{0}\" e \"{1}\"." -#: ../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 "Via interna \"{0}\" está fora." -#: ../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 "Estilo para caminho interno \"{0}\" é multipolígono." -#: ../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 "Estilo para via externa \"{0}\" contém erros." -#: ../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 "não tagueado" -#: ../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 "texto" @@ -3361,5 +3226,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" @@ -3370,5 +3235,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" @@ -3379,5 +3244,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" @@ -3410,5 +3275,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 msgid "Gauss-Laborde Réunion 1947" -msgstr "" +msgstr "Gauss-Laborde Réunion 1947" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 @@ -3449,18 +3314,18 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "UTM20N Guadeloupe Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" +msgstr "UTM20N Martinique Fort Desaix 1952" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Não foi possível ler arquivo ''{0}''. O erro é:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3491,5 +3356,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "ferrovia" @@ -3521,135 +3386,33 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Falha em inicializar a comunicação com o servidor OSM {0}.\n" -"Verifique a URL do servidor nas preferências e também a sua conexão à " -"internet." - -#. 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 "Desconhecido" - -#: ../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 "" -"Envio ao servidor falhou porque seu conjunto
de " -"dados atual viola uma pré-condição.
A mensagem de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Violação de Pré-condição" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Exceção de segurança" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Exceção de rede" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 +msgstr "Erro interno do servidor" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +msgid "Bad Request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Servidor desconhecido" -#: ../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 "" -"Envio falhou porque uma primitiva que você " -"tentou
apagar no servidor já está apagada.

A mensagem de erro é:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitiva já deletada" @@ -3869,5 +3632,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}" @@ -4267,4 +4030,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 @@ -4340,8 +4105,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 @@ -4477,5 +4242,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 "removido" @@ -4535,10 +4300,10 @@ #: ../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 "Não, abortar" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4546,7 +4311,4 @@ "yo agree?" msgstr "" -" Para manter a sua versão local, o JOSM
precisa reiniciar o id de " -"{0} {1} para 0.
No próximo envio o servidor irá
atribuir-lhe um novo " -"id.
Você concorda? " #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4580,4 +4342,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 @@ -4591,5 +4354,5 @@ msgstr "Primitivo" -#: ../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 "" @@ -4697,4 +4460,40 @@ msgstr "Seus dados não inclui uma tag com a chave {0}" +#: ../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 "Nenhum conflito de tags pendentes a ser resolvido" + +#: ../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 "Aplicar" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4707,24 +4506,23 @@ msgstr "todos os números" -#: ../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 "Selecionar uma cor" - -#: ../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 -#, fuzzy, java-format +#: ../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 "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4732,12 +4530,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parâmetro ''{0}'' não pode ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parâmetro ''{0}'' no intervalo de 0..{1} esperado, obtido {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4745,12 +4543,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "não apagado" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "" + +#: ../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 +#: ../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 "" @@ -4761,17 +4560,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "do caminho" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Deletar da relação" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Conflitos nos dados" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4795,41 +4591,91 @@ msgstr[1] "{0} relações" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Resolução de Conflito" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Resolver conflitos" - -#: ../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 "Aplicar" - #: ../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 "Colar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "From ..." -msgstr "" +msgstr "De ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "To ..." -msgstr "" +msgstr "Para ..." #: ../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} via" -msgstr[1] "{0} vias" +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 "Remover da relação o membro na linha atual" + +#: ../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 "lugar" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Pendente" + +#. --- 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 "Regra:" + +#: ../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 "Chave:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Valor" + +#: ../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 "Mão única" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisão" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4856,5 +4702,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}" @@ -4885,5 +4731,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." @@ -4958,13 +4804,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 "Camada: {0}" +msgstr "Caminho {0}" #: ../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 "Relações: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5050,5 +4896,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 "" @@ -5107,5 +4953,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 "Adicionar" @@ -5155,5 +5001,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 "Relações" @@ -5247,9 +5093,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 @@ -5258,20 +5104,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Mostrar" +msgstr "Mostrar informações" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Mais informações sobre esta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"AVISO: lançando janela do browser para somente as primeiras {0} das {1} " -"primitivas selecionadas" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5346,5 +5188,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}" @@ -5363,9 +5205,4 @@ msgid "Child Relations" msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Regra:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5600,5 +5437,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" -msgstr "" +msgstr "Zoom para" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 @@ -5623,11 +5460,11 @@ msgstr "Vinculado" -#: ../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 "Baixar relações referentes" -#: ../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 "" @@ -5641,7 +5478,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Carregar relações de parentesco" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5768,5 +5604,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Lugares" @@ -5844,8 +5680,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "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 "" "Zoom: Roda do mouse, duplo clique ou Ctrl + flecha para Cima / Baixo " @@ -5879,17 +5716,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "Historia por {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "Historia por {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "Editar relação #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5898,7 +5735,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Mostrar histórico da primitiva selecionada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5936,22 +5772,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Carregando histórico para {0} com id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Carregando histórico para {0} com id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Carregando histórico para {0} com id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6786,78 +6622,74 @@ #: 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 "Nome" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Versão {0} criada em {1} por " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Mais informações sobre esta característica" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Última modificação em {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6875,7 +6707,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Nome do rua" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6916,12 +6747,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Por favor, selecione um valor" +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 "Camada ''{0}'' precisa estar na lista de camadas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6965,6 +6795,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" -msgstr "" +#, fuzzy +msgid "Unsaved data and conflicts" +msgstr "Resolver conflitos" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6981,5 +6812,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 "" @@ -6998,5 +6829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -7010,7 +6841,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Descartar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7023,7 +6853,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Salvar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7109,17 +6938,148 @@ #: ../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 "Enviar" + +#: ../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 "enviar todas modificações em um pedido" + +#: ../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 "" +"Habilitar para envio de todas modificações em uma chamada, desabilitar para " +"usar uma chamada por primitiva" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Faça um comentário breve sobre as mudanças que está enviando:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Configurações" + +#: ../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 "Objetos a adicionar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objetos a modificar:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objetos a excluir:" + +#: ../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 "Enviar Modificações" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Arquivo" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Enviar estas modificações?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Enviando" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Por favor, entre com um nome para a location." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Cancelar atualizações e fechar janela" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Não há primitivas selecionadas para atualizar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7352,5 +7312,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." @@ -7408,7 +7367,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Baixando dados" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7469,4 +7427,13 @@ msgid "Convert to GPX layer" msgstr "Converter para camada GPX" + +#: ../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 "" +"O envio de dados não processados de GPS como mapa é considerado " +"arriscado.
Se quiser enviar dados, consulte aqui:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7656,5 +7623,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 "Por favor, selecione a linha para apagar." @@ -8195,5 +8162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" -msgstr "" +msgstr "Inserir URL" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 @@ -8482,8 +8449,4 @@ msgstr "Desativar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Chave:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8540,5 +8503,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 @@ -8549,42 +8512,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Adicionar uma tag vazia" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Excluir camada selecionada." - -#: ../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 "Mais informações sobre esta característica" #. 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 "Atributos opcionais:" -#: ../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 "Usar preferência ''{0}'' do grupo ''{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 "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "via sem saída" -#: ../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 "Tipo desconhecido: {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 @@ -8595,15 +8556,15 @@ msgstr "Não foi possível ler a fonte de preferência de tags: {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 "Erro analisando {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 "Elementos do tipo {0} são suportados." -#: ../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 @@ -8613,18 +8574,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../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 "Nada selecionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Seleção inadequada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Aplicar Preferência" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Alterar propriedades" @@ -8651,5 +8612,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 "Exceção NullPointerException, possivelmente faltam algumas tags." @@ -8665,7 +8625,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 @@ -8743,5 +8700,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}" @@ -8749,5 +8706,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" @@ -8755,5 +8712,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" @@ -8774,6 +8730,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 @@ -8783,40 +8739,40 @@ msgstr "Baixando dados OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Editar relação # {0} na camada ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Nada adicionado à seleção pela busca por \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8878,10 +8834,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 "" @@ -8889,11 +8845,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 "Abrindo conjunto de mudanças..." - -#: ../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}" @@ -8901,34 +8855,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 "Abrindo conjunto de mudanças..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Abrindo conjunto de mudanças..." - -#: ../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 "Abrindo conjunto de mudanças..." - -#: ../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 " @@ -8936,44 +8874,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Fechando conjunto de mudanças..." -#: ../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 "Fechando conjunto de mudanças..." - -#: ../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 "Abrindo conjunto de mudanças..." - -#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Enviando..." -#: ../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}." @@ -8992,10 +8930,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 "" @@ -9053,6 +8991,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 "Arquivos do servidor OSM" @@ -9081,5 +9024,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 "" @@ -9136,74 +9079,139 @@ msgstr "Erro durante interpretação." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Versão desconhecida" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Faltando número de versão nos dados dos mapas" - -#: ../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 "Faltando atributo obrigatório \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Versão desconhecida: {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 "Encontrado elemento em non-way." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " tem ref zero" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Encontrado elemento em non-relation." - -#: ../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 "Especificação de incompleta com 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 "Objeto ilegal com 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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Versão desconhecida: {0}" + +#: ../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 "Faltando atributo obrigatório \"{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 "" @@ -9212,16 +9220,32 @@ 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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "" +"não é possível comparar um primitivo com id ''{0}'' com um primitivo com id " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Preparando dados OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Identificação de nó mal-formada" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Preparando dados OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Preparando dados..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9268,20 +9292,39 @@ "conexão de internet." -#: ../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} faltando. Subindo {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} faltando. Subindo {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} faltando. Subindo {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 "Enviando..." + +#: ../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 "" @@ -9289,14 +9332,4 @@ "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 "Não há nada a enviar. Baixe dados primeiro." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -#, fuzzy -msgid "Starting to upload with one request per primitive ..." -msgstr "Falha ao apagar as primitivas selecionadas." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 @@ -9333,11 +9366,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 "" @@ -9350,4 +9378,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 @@ -9389,20 +9422,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 "Desabilitar plugin" #: ../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 "Não foi possível carregar plugin {0}. Apagar das preferências?" -#: ../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 " @@ -9412,5 +9445,9 @@ "de sobreescrever os existentes." -#: ../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 "" @@ -9418,10 +9455,10 @@ msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{0}''." -#: ../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 "De acordo com as informações no plugin, o autor é {0}." -#: ../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." @@ -9430,9 +9467,9 @@ "bug." -#: ../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 "O plugin deve ser desabilitado?" -#: ../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 " @@ -9442,13 +9479,13 @@ "desativar o plugin." -#: ../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 +msgstr "Informações sobre o plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -9505,4 +9542,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 "Desconhecido" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9576,4 +9644,93 @@ msgstr "(O texto já foi copiado para a Área de Transferência)" +#: ../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 "" +"Envio ao servidor falhou porque seu conjunto
de " +"dados atual viola uma pré-condição.
A mensagem de erro é:
{0}" + +#: ../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 "" +"Envio falhou porque uma primitiva que você " +"tentou
apagar no servidor já está apagada.

A mensagem de erro é:" +"
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9645,5 +9802,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9652,5 +9809,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9659,5 +9816,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9666,5 +9823,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9673,5 +9830,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9722,5 +9879,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 msgid "Upload Trace" -msgstr "" +msgstr "Enviar Trilha" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 @@ -9728,42 +9885,41 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Upload Traces" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134 +msgstr "Enviar Trilhas" + +#: ../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 +msgstr "Visibilidade" + +#: ../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 (EN)" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + +#: ../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 "Descrição" -#: ../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}" @@ -9771,53 +9927,53 @@ #. 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 "Conectando..." -#: ../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 "" +msgstr "Enviar Trilha GPX" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 msgid "Uploads traces to openstreetmap.org" -msgstr "" +msgstr "Enviar trilhas para openstreetmap.org" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 @@ -10000,5 +10156,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497 msgid "Offset:" -msgstr "" +msgstr "Deslocamento:" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509 @@ -10022,5 +10178,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 "" @@ -10034,13 +10190,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 "" @@ -10049,9 +10205,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 "" @@ -10060,65 +10216,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 " @@ -10126,13 +10282,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 "Valores Predefinidos" @@ -10170,5 +10326,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 "Erro ao carregar arquivo" @@ -10215,13 +10371,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" @@ -10230,13 +10386,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 "" @@ -10348,9 +10504,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 "" @@ -10362,5 +10518,5 @@ #, java-format msgid "Downloading {0}" -msgstr "" +msgstr "Baixando {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 @@ -10496,14 +10652,13 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" -msgstr "" +msgstr "Leste" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" -msgstr "" +msgstr "Norte" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Selecionar" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10587,5 +10742,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 "" @@ -10743,5 +10898,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 msgid "EditGpx" -msgstr "" +msgstr "EditGpx" #. TODO what is icon at the end? @@ -10838,5 +10993,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116 msgid "Configure Device" -msgstr "" +msgstr "Configurar o Aparelho" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125 @@ -10947,5 +11102,5 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144 msgid "Rotate left" -msgstr "" +msgstr "Girar para a esquerda" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146 @@ -10955,5 +11110,5 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163 msgid "Rotate right" -msgstr "" +msgstr "Girar para a direita" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165 @@ -11290,5 +11445,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsData.java:130 msgid "no name" -msgstr "" +msgstr "sem nome" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45 @@ -11383,5 +11538,5 @@ #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94 msgid "Angle" -msgstr "" +msgstr "Ângulo" #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95 @@ -11407,5 +11562,5 @@ #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 msgid "OpenLayers" -msgstr "" +msgstr "OpenLayers" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 @@ -11467,5 +11622,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63 msgid "Add a comment" -msgstr "" +msgstr "Adicionar um comentário" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64 @@ -11475,5 +11630,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52 msgid "Mark as done" -msgstr "" +msgstr "Marcar como Terminada" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64 @@ -11501,5 +11656,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92 msgid "Please enter a user name" -msgstr "" +msgstr "Por favor entrar um nome" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49 @@ -11507,18 +11662,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}" @@ -11529,5 +11684,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11535,9 +11690,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 "" @@ -11548,28 +11703,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Criar novo nó." + +#: ../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 "Controle Remoto" -#: ../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 " @@ -11578,28 +11738,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 "" @@ -11652,5 +11818,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" -msgstr "" +msgstr "Critério" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 @@ -11892,10 +12058,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24 msgid "Item" -msgstr "" +msgstr "Ítem" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 msgid "Filter" -msgstr "" +msgstr "Filtro" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63 @@ -12090,25 +12256,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Entrada de valores para todos conflitos" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Resolver conflitos" + #: ../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 "" @@ -12180,6 +12354,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 "" @@ -12189,10 +12363,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 "" @@ -12279,51 +12453,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 "Corrigir" -#: ../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 "Ignorar" -#: ../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 "Nada" -#: ../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 "Enviando dados" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12355,7 +12543,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Guarda de trânsito" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12363,18 +12550,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 "Confirmação" @@ -12382,7 +12569,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 "Duplicar" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12393,7 +12579,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Apagar nós ou caminhos." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12958,5 +13143,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -13040,5 +13225,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 " @@ -13046,5 +13231,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 "" @@ -13062,17 +13247,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 "" @@ -13113,19 +13298,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Ativar" - -#: ../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 "" @@ -13136,116 +13320,126 @@ 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:225 +msgid "" +"The requested area is too big. Please zoom in a little, or change resolution" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 +msgid "Download visible tiles" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 +msgid "Change resolution" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 +msgid "Reload erroneous tiles" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 +msgid "Alpha channel" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 +msgid "Save WMS layer to file" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 +msgid "Save WMS layer" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +msgid "Load WMS layer from file" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +msgid "Load WMS layer" +msgstr "" + +#: ../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:401 +msgid "File Format Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 +msgid "WMS" +msgstr "" + +#: ../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:45 +msgid "WMS Plugin Preferences" +msgstr "" + +#: ../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:47 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 +msgid "Menu Name" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84 +msgid "WMS URL" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 +msgid "Menu Name (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 +msgid "WMS URL (Default)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 +msgid "Enter a menu name and WMS URL" +msgstr "" + +#: ../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 "Invalid URL?" -msgstr "Data inválida" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 -msgid "" -"The requested area is too big. Please zoom in a little, or change resolution" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 -msgid "Download visible tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 -msgid "Change resolution" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 -msgid "Reload erroneous tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 -msgid "Alpha channel" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 -msgid "Save WMS layer to file" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 -msgid "Save WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 -msgid "Load WMS layer from file" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 -msgid "Load WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392 -#, java-format -msgid "Unsupported WMS file version; found {0}, expected {1}" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 -msgid "File Format Error" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 -msgid "WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 -msgid "Open a blank WMS layer to load data from a file" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 -msgid "WMS Plugin Preferences" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 -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 -msgid "Menu Name" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 -msgid "WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 -msgid "Menu Name (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 -msgid "WMS URL (Default)" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 -msgid "Enter a menu name and WMS URL" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +msgid "Overlap tiles" +msgstr "Arquivos do servidor OSM" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Copy Selected Default(s)" -msgstr "Copiar padrões" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy -msgid "Please select at least one row to copy." -msgstr "Favor selecionar no mínimo um caminho." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "norte" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "Arcivo TCX (*.tcx)" +msgstr "" #. * @@ -13605,5 +13799,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 "Referência" @@ -14145,7 +14339,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Chalé" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14166,8 +14359,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 "Aluguel" +msgstr "" #. color heath @@ -14185,5 +14377,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 "madeira" @@ -14196,7 +14389,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "tíquetes de estacionamento" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14232,7 +14424,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "seleção" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14243,7 +14434,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incompleto" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14254,7 +14444,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "grama" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14448,4 +14637,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" @@ -14474,12 +14664,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 "sim" #. color permissive -#. +#. #. 1 #. 40000 @@ -14527,5 +14717,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14562,5 +14752,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14624,6 +14814,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 "não" @@ -14769,6 +14960,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 "Tipo" @@ -15039,7 +15230,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Faixa de Pedestres" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15058,7 +15248,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Barreiras" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15350,7 +15539,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 "Operador" @@ -15563,6 +15752,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 "Altitude" @@ -16474,7 +16663,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" @@ -16522,23 +16708,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 "Horário de Funcionamento" @@ -16562,5 +16748,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" @@ -16607,22 +16792,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 "" @@ -16637,22 +16822,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 "" @@ -16667,22 +16852,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 "" @@ -16716,5 +16901,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 "Número de Referência" @@ -16961,5 +17146,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Abrigo" @@ -17344,7 +17529,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Pare" +msgstr "" #. color tertiary @@ -17387,28 +17571,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "chinessa" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Baixar Área" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Colar" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Cidade" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regional" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17436,7 +17615,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Chafariz" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17450,7 +17628,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "indiana" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17467,13 +17644,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Editar Continente" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Polícia" +msgstr "" #: build/trans_presets.java:1737 @@ -17490,7 +17665,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "uso da terra" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17501,19 +17675,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informações" +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 "Descrição de símbolo" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Audio" +msgstr "" #. @@ -17524,7 +17695,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Número de telefone" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17848,5 +18018,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17880,5 +18050,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19004,6 +19174,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 "" @@ -19012,66 +19182,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 "bahai" -#: 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 "budismo" -#: 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 "cristianismo" -#: 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ísmo" -#: 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 "jainismo" -#: 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 "judaísmo" -#: 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 "muçulmano" -#: 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 "sikhismo" -#: 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 "espiritismo" -#: 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 "taoísmo" -#: 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 "unitarianismo" -#: 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 "zoroastrianismo" -#: 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 "Denominação" @@ -19080,76 +19250,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 "anglicana" -#: 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 "batista" -#: 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 "católica" -#: 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 "evangélica" -#: 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 "testemunha de jeová" -#: 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 "luterana" -#: 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 "metodista" -#: 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 "mórmon" -#: 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 "ortodoxa" -#: 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 "pentecostal" -#: 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 "presbiteriana" -#: 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 "protestante" -#: 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 "quaker" -#: 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 "xiismo" -#: 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 "sunismo" @@ -19481,5 +19651,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 "Nota" @@ -19504,5 +19674,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 "Moedas" @@ -19510,5 +19680,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 "Notas" @@ -19516,5 +19686,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 "" @@ -19522,5 +19692,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 "" @@ -19528,5 +19698,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 "Cartão de Crédito" @@ -19585,10 +19755,144 @@ msgstr "Banco" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Voltar" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Memorial" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "nenhum" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "lugar" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Cor" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Voltar" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "abaixo" + +#. 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 "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "terminar" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valor" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "água" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Quantidade de Cabos" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19597,30 +19901,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 "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "baixa" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Chafariz" @@ -19629,10 +19933,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Editar Chafariz" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Bebedouro" @@ -19641,10 +19945,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Editar Bebedouro" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19652,35 +19956,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 "Lojas" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermercado" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Editar Supermercado" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Chalé" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Editar Chalé" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Loja de Conveniência" @@ -19688,9 +19990,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Editar Loja de Conveniência" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Quiosque" @@ -19698,29 +20000,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Editar Quiosque" -#: 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 "Editar Ponto de Ônibus" - -#: 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 "Editar Árvore" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "" @@ -19728,5 +20028,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Editar Máquina de Vendas" @@ -19734,88 +20034,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Produtos à venda" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "tíquetes de transporte público" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "mapas de transporte público" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "tíquetes de estacionamento" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "comida" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "bebidas" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "doces" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigarros" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "ração animal" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "jornais" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "brinquedos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "selos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "Cartões SIM" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "preservativos" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "absorventes" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "sacos para fezes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Cartões de fidelidade" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Açougue" @@ -19823,9 +20123,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Editar Açougue" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Padaria" @@ -19833,9 +20133,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Editar Padaria" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Floricultura" @@ -19843,18 +20143,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Editar Floricultura" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Orgânicos" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Editar Loja de Orgânicos" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Álcool" @@ -19862,54 +20162,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Bebidas" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Editar Loja de Bebidas" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Computador" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Editar Loja de Computador" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Eletrônicos" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Editar Loja de Eletrônicos" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Equipamentos de Áudio" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Editar Loja de Equipamentos de Áudio" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Móveis" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Editar Loja de Móveis" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Loja de Plantas" @@ -19917,9 +20217,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Editar Loja de Plantas" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19927,9 +20227,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Editar Loja de Utilidades Domésticas" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19937,54 +20237,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 "Papelaria" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Editar Papelaria" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Cabelereiro" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Editar Cabelereiro" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Sapatos" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Editar Loja de Sapatos" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Brinquedos" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Editar Loja de Brinquedos" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Locadora de Vídeo" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Editar Locadora de Vídeo" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Lavanderia à Seco" @@ -19992,9 +20292,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Editar Lavanderia à Seco" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Lavanderia" @@ -20002,9 +20302,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Editar Lavanderia" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -20012,32 +20312,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Esportes" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Editar Loja de Esportes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Óculos" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Editar Loja de Óculos" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Dinheiro" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banco" @@ -20045,14 +20345,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Editar Banco" -#: 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 "Caixa Eletrônico" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Loja de Câmbio" @@ -20060,5 +20360,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Editar Loja de Câmbio" @@ -20066,15 +20366,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Editar Caixa Eletrônico" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Saúde" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Médicos" @@ -20082,18 +20382,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Editar Médicos" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dentistas" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Editar Dentistas" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Farmácia" @@ -20101,5 +20401,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Editar Farmácia" @@ -20107,9 +20407,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hospital" @@ -20117,10 +20417,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Editar Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Entrada de Emergência" @@ -20129,5 +20429,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Editar Entrada de Emergência" @@ -20136,20 +20436,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Número de telefone" #. 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 "(Use código internacional, como +12-345-67890)" @@ -20157,5 +20457,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 "Veterinária" @@ -20164,55 +20464,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Editar Veterinária" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Editar Continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "País" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Editar País" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Estado" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Editar Estado" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Região" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Editar Região" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Condado" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Editar Condado" @@ -20220,15 +20520,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Cidade" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Editar Cidade (mais que 100 mil habitantes)" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Cidade (menos que 100 mil habitantes)" @@ -20236,10 +20536,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Editar Cidade (menos que 100 mil habitantes)" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Bairro" @@ -20247,25 +20547,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Editar Bairro" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Vilarejo" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Editar Vilarejo" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -20273,5 +20573,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20279,10 +20579,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ilha" @@ -20290,24 +20590,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Editar Ilha" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "esquerda" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Editar Chalé" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Entrada de Caverna" @@ -20315,10 +20613,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Editar Entrada de Caverna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Pico" @@ -20326,10 +20624,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Editar Pico" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Geleira" @@ -20337,10 +20635,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Editar Geleira" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulcão" @@ -20348,70 +20646,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Editar Vulcão" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Fronteiras" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nacional" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Editar Fronteiras Nacionais" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrativo" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Editar Fronteiras Administrativas" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Editar Fronteiras Civis" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Político" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Editar Fronteiras Políticas" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Parque nacional" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Editar Fronteira de Parque Nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Uso da terra" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Árvore" @@ -20420,15 +20718,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Editar Árvore" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Nome Botânico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Floresta" @@ -20437,5 +20735,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Editar Floresta" @@ -20443,17 +20741,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 "conífera" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "decídua" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "misturado" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Floresta" @@ -20462,14 +20760,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Reserva Natural" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Editar Reserva Natural" @@ -20477,25 +20775,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Arbusto" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Editar arbusto" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20503,10 +20801,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Editar rocha" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Matagal" @@ -20514,5 +20812,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Editar matagal" @@ -20520,5 +20818,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20527,45 +20825,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20573,25 +20871,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Jardim" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Editar Jardim" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20599,10 +20897,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20610,20 +20908,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Parque" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Editar Parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "área de recreação" @@ -20631,5 +20929,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20637,15 +20935,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Área residencial" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Cemitério" @@ -20653,9 +20951,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Editar Cemitério" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cemitério" @@ -20663,39 +20961,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Comercial" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20703,15 +21001,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militar" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20719,55 +21017,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Área de construção" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Pedreira" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolígono" @@ -20777,5 +21075,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 "Editar Multipolígono" @@ -20784,10 +21082,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "segmento externo" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "segmento interno" @@ -20795,5 +21093,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Restrição de manobra" @@ -20802,5 +21100,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Editar restrição de manobras" @@ -20808,34 +21106,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Restrição" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "proibida_conversão_esquerda" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "proibida_conversão_direita" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "proibido_em_frente" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "proibido_retornar" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "somente_a_direita" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "somente_a_esuqerda" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "somente_em_frente" @@ -20844,15 +21142,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "do caminho" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "nó de via ou caminho" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "para caminho" @@ -20860,5 +21158,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20867,5 +21165,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20873,5 +21171,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Tipo de rota" @@ -20879,5 +21177,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20943,5 +21241,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 @@ -20950,17 +21248,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "ônibus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "estrada" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "Ferry" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "Esqui" @@ -21013,5 +21311,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 @@ -21020,13 +21318,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "caminhada" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "bonde/VLT" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "desvio" @@ -21040,10 +21338,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "Metrô" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Descrição de símbolo" @@ -21051,31 +21349,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "Proposto" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "alternativa" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "temporário" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Cor (hex)" @@ -21084,30 +21382,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "segmento de rota" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "segmento em frente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "Ponto de parada" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "ponto de parada em frente" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "ponto de parada atrás" @@ -24260,76 +24558,4 @@ msgstr "histórico" -#. 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 "" - #. color green #. @@ -25297,91 +25523,48 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Todos caminhos estavam vazios" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Unir nós com usuários diferentes?" + +#~ msgid "Merge Anyway" +#~ msgstr "Unir mesmo assim" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Por favor selecione caminhos com ângulos praticamente retos para " -#~ "ortogonalização" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por " -#~ "favor, relate isso como uma falha do programa." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Apagar {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Apagar membro de relação {0}{1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Não foi possível abrir o diretório de preferências: {0}" - -#~ msgid "nodes" -#~ msgstr "nós" - -#~ msgid "ways" -#~ msgstr "caminhos" - -#~ msgid "relations" -#~ msgstr "relações" - -#~ msgid "changesets" -#~ msgstr "conjunto de mudanças" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ " Falha ao carregar histórico a partir do servidor. Detalhes:
" -#~ "{0} " - -#~ msgid "Delete Layer" -#~ msgstr "Excluir Camada" - -#~ msgid "Delete all" -#~ msgstr "Apagar tudo" - -#~ msgid "Authors: {0}" -#~ msgstr "Autores: {0}" - -#~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" -#~ msgstr "" -#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: " -#~ "{0}" - -#~ msgid "Public" -#~ msgstr "Público" - -#~ msgid "Continue anyway" -#~ msgstr "Continuar assim mesmo" - -#~ msgid "Edit Information Office" -#~ msgstr "Editar Centro de Informações Turísticas" - -#~ msgid "Map Type" -#~ msgstr "Tipo de Mapa" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "citymap" -#~ msgstr "mapa da cidade" - -#~ msgid "bicyclemap" -#~ msgstr "mapa de ciclovias" - -#~ msgid "Board Type" -#~ msgstr "Tipo de Quadro" - -#~ msgid "board" -#~ msgstr "quadro" +#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda " +#~ "pretende uni-los?" + +#~ msgid "Unknown version" +#~ msgstr "Versão desconhecida" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Faltando número de versão nos dados dos mapas" + +#~ msgid "Found element in non-way." +#~ msgstr "Encontrado elemento em non-way." + +#~ msgid " has zero ref" +#~ msgstr " tem ref zero" + +#~ msgid "Found element in non-relation." +#~ msgstr "Encontrado elemento em non-relation." + +#~ msgid "Ill-formed node id" +#~ msgstr "Identificação de nó mal-formada" #~ msgid "Aborting..." @@ -25413,4 +25596,11 @@ #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor." + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Não foi possível abrir o diretório de preferências: {0}" #~ msgid "" @@ -25460,7 +25650,4 @@ #~ msgstr "Adicionar Selecionado" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Remover da relação o membro na linha atual" - #~ msgid "Move Down" #~ msgstr "Mover para baixo" @@ -25478,7 +25665,13 @@ #~ msgstr "Editor de relações: {0}" +#~ msgid "Authors: {0}" +#~ msgstr "Autores: {0}" + #~ msgid "There are unsaved changes. Delete the layer anwyay?" #~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?" +#~ msgid "Delete Layer" +#~ msgstr "Excluir Camada" + #~ msgid "Merge the layer directly below into the selected layer." #~ msgstr "Unir camada diretamente inferior com camada selecionada." @@ -25492,4 +25685,9 @@ #~ msgid "Those nodes are not in a circle." #~ msgstr "Estes nós não estão em um círculo" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Por favor selecione caminhos com ângulos praticamente retos para " +#~ "ortogonalização" #~ msgid "Could not rename the file \"{0}\"." @@ -25524,4 +25722,11 @@ #~ msgstr "YAHOO! (GNOME Fix)" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por " +#~ "favor, relate isso como uma falha do programa." + #~ msgid "Missing primitive" #~ msgstr "Faltando primitiva" @@ -25540,4 +25745,7 @@ #~ msgid "unnamed" #~ msgstr "sem nome" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar." #~ msgid "Unknown file extension." @@ -25576,4 +25784,19 @@ #~ "a
resultados indesejados quando fizer alinhamentos retangulares." #~ "
Mude sua projeção para evitar esta notificação.
Pretende continuar?" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Apagar {1} {0}" + +#~ msgid "nodes" +#~ msgstr "nós" + +#~ msgid "ways" +#~ msgstr "caminhos" + +#~ msgid "relations" +#~ msgstr "relações" + +#~ msgid "changesets" +#~ msgstr "conjunto de mudanças" #~ msgid "Could not write bookmark." @@ -25604,6 +25827,45 @@ #~ msgstr "Não há dados" -#~ msgid "end" -#~ msgstr "terminar" +#~ msgid "Public" +#~ msgstr "Público" + +#~ msgid "Continue anyway" +#~ msgstr "Continuar assim mesmo" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ " Falha ao carregar histórico a partir do servidor. Detalhes:
" +#~ "{0} " + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Apagar membro de relação {0}{1}" + +#~ msgid "Edit Information Office" +#~ msgstr "Editar Centro de Informações Turísticas" + +#~ msgid "Map Type" +#~ msgstr "Tipo de Mapa" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "citymap" +#~ msgstr "mapa da cidade" + +#~ msgid "bicyclemap" +#~ msgstr "mapa de ciclovias" + +#~ msgid "Board Type" +#~ msgstr "Tipo de Quadro" + +#~ msgid "board" +#~ msgstr "quadro" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: " +#~ "{0}" #~ msgid "" @@ -25613,2 +25875,5 @@ #~ "Falha ao acessar propriedade de sistema ''{0}'' por razões de segurança. " #~ "Exceção foi: {1}" + +#~ msgid "Delete all" +#~ msgstr "Apagar tudo" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 17594) +++ /applications/editors/josm/i18n/po/ro.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-18 14:09+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 13:32+0000\n" "Last-Translator: Manuel R. Ciosici \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -23,5 +23,5 @@ "X-Poedit-SourceCharset: utf-8\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" @@ -29,5 +29,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 @@ -36,18 +36,20 @@ msgstr "_Ajutor" -#: ../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 "Proiecția {0} nu a putut fi activată. Se folosește Mercator." -#: ../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 @@ -63,8 +65,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 @@ -78,6 +80,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 @@ -87,5 +89,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 @@ -105,55 +107,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 "Eroare" -#: ../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] "Exista modificări nesalvate. Renunţ la modificări şi continui?" -msgstr[1] "Exista modificări nesalvate. Renunţ la modificări şi continui?" -msgstr[2] "Exista modificări nesalvate. Renunţ la modificări şi continui?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Modificări nesalvate" -#: ../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 "Salvez şi Ies" -#: ../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 "Renunţ şi Ies" -#: ../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 @@ -162,11 +160,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 @@ -180,20 +179,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 "Renunţă" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Se ignoră URL-ul prost format: \"{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 @@ -210,16 +209,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 @@ -249,12 +248,14 @@ msgstr "Avertisment" -#: ../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 "Se ingoră fişierul URL prost format: \"{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}" @@ -344,5 +345,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 "Module" @@ -475,9 +476,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 @@ -511,6 +512,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 @@ -529,11 +530,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 "" @@ -555,5 +556,5 @@ msgstr "Te rog selectează cel puţin trei noduri." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -562,10 +563,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -574,5 +575,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -581,9 +582,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -638,73 +639,57 @@ msgstr "" -#: ../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 "Combină calea" -#: ../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 "Combină mai multe căi într-una." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Combină oricum" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Schimbă direcţiile?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Inversează şi Combină" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Căile nu pot fi combinate în direcţiile actuale. Doreşti să inversezi unele " +"din ele?" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Combină {0} căi" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Selectează te rog cel puţin două căi pentru a le combina." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Combină oricum" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Schimbă direcţiile?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Inversează şi Combină" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Căile nu pot fi combinate în direcţiile actuale. Doreşti să inversezi unele " -"din ele?" - -#: ../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 "Introdu valori pentru toate conflictele." - -#: ../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 "Rezolvă Conflictele" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Combină {0} căi" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -758,5 +743,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 "Şterge" @@ -766,15 +751,15 @@ msgstr "" -#: ../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 "Suprascrie" -#: ../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 "Fişierul există. Îl suprascriu?" @@ -803,10 +788,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}" @@ -837,5 +822,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 @@ -1012,1024 +997,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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "" - -#: ../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 "Nu pot muta obiecte în afara lumii." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Deschide un fişier." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Deschide un fişier." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Preferinţe..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Deschide o pagină de preferinţe pentru opţiunile globale" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Preferinţe" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Refă" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Refă ultima acţiune anulată." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Redenumire strat" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Şi redenumeşte şi fişierul" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "" - -#: ../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 "Salvează" - -#: ../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 "Salvează datele curente." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../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 "Document gol" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Conflicte" - -#: ../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 "" -"Există conflicte nerezolvate. Conflictele nu vor fi salvate şi se vor trata " -"ca şi cum aţi refuzat totul. Continui?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "" - -#: ../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 "" - -#: ../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 "Salvează datele curente într-un fişier nou." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "" - -#: ../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] "" -msgstr[1] "" - -#: ../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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "" - -#: ../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] "" -msgstr[1] "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 -#, fuzzy -msgid "Close the current changeset ..." -msgstr "Salvează datele curente." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Trasează linii între puncte gps neprelucrate" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Anulează" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Anulează ultima acţiune." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Despre JOSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Trimite toate schimbările la serverul OSM." - -#: ../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 "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nimic de transmis. Mai întâi obţineţi nişte date." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Nu sunt schimbări de transmis." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "" - -#: ../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 -msgid "Upload to a new or to an existing changeset?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Opţiuni hartă" - -#: ../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 "Obiecte de adăugat:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Obiecte de modificat:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Obiecte de şters:" - -#: ../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] "Obiecte de adăugat:" -msgstr[1] "Obiecte de adăugat:" -msgstr[2] "Obiecte de adăugat:" - -#: ../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] "Obiecte de modificat:" -msgstr[1] "Obiecte de modificat:" -msgstr[2] "Obiecte de modificat:" - -#: ../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] "Obiecte de şters:" -msgstr[1] "Obiecte de şters:" -msgstr[2] "Obiecte de şters:" - -#: ../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 "Ultima modificare la {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Apropie" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Apropie" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Descarc date GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Date GPS neprelucrate" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Descarc date" - -#: ../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 "Nu au fost importate date." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Date OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "" - -#: ../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 "" - -#: ../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 @@ -2040,7 +1026,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 @@ -2049,6 +1036,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 @@ -2079,4 +1066,869 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "" + +#: ../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 "Nu pot muta obiecte în afara lumii." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Deschide un fişier." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" + +#: ../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 "Preferinţe..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Deschide o pagină de preferinţe pentru opţiunile globale" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Preferinţe" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Refă" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Refă ultima acţiune anulată." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Redenumire strat" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Şi redenumeşte şi fişierul" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "" + +#: ../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 "Salvează" + +#: ../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 "Salvează datele curente." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../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 "Document gol" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Conflicte" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "" + +#: ../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 "" +"Există conflicte nerezolvate. Conflictele nu vor fi salvate şi se vor trata " +"ca şi cum aţi refuzat totul. Continui?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "" + +#: ../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 "" + +#: ../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 "Salvează datele curente într-un fişier nou." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "" + +#: ../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] "" +msgstr[1] "" + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "" + +#: ../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] "" +msgstr[1] "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Trasează linii între puncte gps neprelucrate" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Anulează" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Anulează ultima acţiune." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Despre JOSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Trimite toate schimbările la serverul OSM." + +#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Nu sunt schimbări de transmis." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Apropie" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Apropie" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Descarc date GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Date GPS neprelucrate" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Descarc date" + +#: ../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 "Nu au fost importate date." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Date OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "" + +#: ../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 "" + +#: ../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 @@ -2189,18 +2041,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 "Selectaţi" -#: ../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" @@ -2209,17 +2061,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 "" @@ -2229,5 +2081,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 "" @@ -2392,41 +2244,41 @@ msgstr "Căutare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "" -#: ../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 "" -#: ../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 "" @@ -2436,40 +2288,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 "" -#: ../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 "" @@ -2478,5 +2330,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." @@ -2513,7 +2365,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Adaugă nod" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2528,17 +2380,17 @@ #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Schimb {0} obiect" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Ultima modificare la {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Schimbă direcţiile?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -2639,10 +2491,9 @@ #: ../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] "Schimb {0} obiect" -msgstr[1] "Schimb {0} obiecte" -msgstr[2] "Schimb {0} de obiecte" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 @@ -2652,13 +2503,11 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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] "Combină {0} căi" -msgstr[1] "Combină {0} căi" -msgstr[2] "Combină {0} căi" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 @@ -2668,5 +2517,4 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2700,5 +2548,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." @@ -2776,17 +2624,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2796,17 +2644,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Rezolvă {0} conflicte în {1} obiecte" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3011,5 +2859,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 @@ -3017,23 +2865,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 +#, java-format +msgid "paramete''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "" + +#: ../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 @@ -3046,11 +2919,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 "" @@ -3101,9 +2979,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." @@ -3112,118 +2990,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 "" @@ -3246,5 +3124,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" @@ -3256,5 +3134,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" @@ -3266,5 +3144,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" @@ -3373,5 +3251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "" @@ -3403,127 +3281,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 "necunoscut" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Gazdă necunoscută" -#: ../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 "" @@ -3737,5 +3521,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}" @@ -4112,4 +3896,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 @@ -4181,8 +3967,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 @@ -4305,5 +4091,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 "şters" @@ -4363,5 +4149,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 "" @@ -4403,4 +4189,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 @@ -4414,5 +4201,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 "" @@ -4518,4 +4305,39 @@ 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 +msgid "No conflicts to resolve" +msgstr "" + +#: ../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 @@ -4528,24 +4350,23 @@ msgstr "" -#: ../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 "Alegeţi o culoare" - -#: ../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}''" @@ -4566,14 +4387,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 "Nu a fost încă implementat." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4586,7 +4408,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "elimină din selecţie" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4614,18 +4435,4 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -msgid "Cancel conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Rezolvă Conflictele" - -#: ../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 @@ -4644,10 +4451,72 @@ #: ../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} punct" -msgstr[1] "{0} puncte" -msgstr[2] "{0} de puncte" +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 +msgid "Remove this relation member from the relation" +msgstr "" + +#: ../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 "Nume real" + +#: ../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 "Valoare" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revizia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4674,5 +4543,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}" @@ -4705,5 +4574,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." @@ -4784,7 +4653,7 @@ #: ../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 "Versiune {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4870,5 +4739,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 "" @@ -4928,5 +4797,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 "Adaugă" @@ -4976,5 +4845,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 "" @@ -5072,5 +4941,4 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5163,5 +5031,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}" @@ -5179,9 +5047,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 "" @@ -5432,11 +5295,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 "" @@ -5572,5 +5435,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "" @@ -5651,5 +5514,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 "" @@ -5699,7 +5562,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Descarcă hărţi de la serverul OSM." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6582,52 +6444,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 "Nume" @@ -6637,11 +6499,10 @@ 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 "Schimbă direcţiile?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 @@ -6650,7 +6511,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Ultima modificare la {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6668,7 +6529,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Selecţie" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6709,7 +6569,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Vă rog selectaţi o valoare" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 @@ -6756,8 +6615,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6773,8 +6631,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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 "" @@ -6791,8 +6648,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6806,7 +6662,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Renunţ şi Ies" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6819,7 +6674,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Salvez şi Ies" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6905,12 +6759,140 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "" + +#: ../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 "Obiecte de adăugat:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Obiecte de modificat:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Obiecte de şters:" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Filename" -msgstr "Nume utilizator" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 -#, fuzzy -msgid "Upload" -msgstr "Reîncarcă" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Vă rog introduceţi un nume pentru locaţie." + +#: ../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 @@ -7148,5 +7130,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." @@ -7200,7 +7181,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Descarc date" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7260,4 +7240,10 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" msgstr "" @@ -7450,5 +7436,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 "Vă rog selectaţi rândul care va fi şters." @@ -8267,8 +8253,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!" @@ -8325,5 +8307,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 @@ -8338,37 +8320,36 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Şterge stratul selectat." - -#: ../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 "" #. 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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "" -#: ../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 @@ -8379,15 +8360,15 @@ msgstr "" -#: ../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 "Eroare la prelucrarea {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 "" -#: ../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 @@ -8398,18 +8379,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../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 "" -#: ../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 "Modificare proprietăţi" @@ -8436,5 +8417,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 "" @@ -8450,7 +8430,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 @@ -8524,5 +8501,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}" @@ -8530,5 +8507,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" @@ -8536,5 +8513,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" @@ -8555,6 +8531,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 @@ -8564,40 +8540,40 @@ msgstr "Descarc datele OSM..." -#: ../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 " @@ -8659,10 +8635,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 "" @@ -8670,11 +8646,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 "Pregătesc datele..." - -#: ../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}" @@ -8682,33 +8656,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 -#, java-format -msgid "Reusing existing changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#: ../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 "Ultima modificare la {0}" - -#: ../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 " @@ -8716,44 +8675,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "" -#: ../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 "Contactez {0}..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Leaving changeset {0} open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "" -#: ../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}." @@ -8772,10 +8731,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 "" @@ -8835,6 +8794,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 "" @@ -8863,5 +8827,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 "" @@ -8918,74 +8882,139 @@ msgstr "Eroare la prelucrare." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Versiune necunoscută" - -#: ../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 +#, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "rezolvat în versiunea:" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "" - -#: ../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 "" -#: ../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 "Obiect ilegal cu 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 +#, java-format +msgid "Missing required attribute ''{0}''." msgstr "" #: ../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 "" @@ -8994,16 +9023,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 "" -#: ../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 "Pregătesc datele..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Pregătesc datele..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9048,33 +9091,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#: ../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 "Pregătesc datele..." + +#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9109,11 +9162,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 "" @@ -9126,4 +9174,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 @@ -9163,20 +9216,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 " @@ -9184,5 +9237,9 @@ msgstr "" -#: ../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 "" @@ -9190,19 +9247,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 " @@ -9210,13 +9267,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" @@ -9267,4 +9324,35 @@ msgstr "" +#. 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 "necunoscut" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9332,4 +9420,88 @@ msgstr "" +#: ../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 @@ -9392,5 +9564,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9399,5 +9571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9406,5 +9578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9413,5 +9585,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9420,5 +9592,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9477,39 +9649,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 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +#: ../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}" @@ -9517,47 +9689,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 "" @@ -9766,5 +9938,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 "" @@ -9778,13 +9950,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 "" @@ -9793,9 +9965,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 "" @@ -9804,65 +9976,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 " @@ -9870,13 +10042,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 "" @@ -9914,5 +10086,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 "" @@ -9959,13 +10131,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" @@ -9974,13 +10146,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 "" @@ -10090,9 +10262,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 "" @@ -10245,7 +10417,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Selectaţi" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10329,5 +10500,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 "" @@ -11249,18 +11420,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}" @@ -11271,5 +11442,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 " @@ -11277,9 +11448,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 "" @@ -11290,28 +11461,32 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +msgid "create new objects" +msgstr "" + +#: ../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 " @@ -11320,28 +11495,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 "" @@ -11832,25 +12013,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Introdu valori pentru toate conflictele." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Rezolvă Conflictele" + #: ../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 "" @@ -11922,6 +12111,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 "" @@ -11931,10 +12120,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 "" @@ -12021,51 +12210,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 "Pregătesc datele..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12104,18 +12307,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 "" @@ -12697,5 +12900,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12779,5 +12982,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 " @@ -12785,5 +12988,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 "" @@ -12801,17 +13004,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 "" @@ -12855,15 +13058,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -12874,107 +13077,118 @@ 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:110 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Selectează te rog cel puţin două căi pentru a le combina." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" msgstr "" @@ -13340,5 +13554,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 "" @@ -13900,8 +14114,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 "Email" +msgstr "" #. color heath @@ -13919,5 +14132,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 "" @@ -13965,7 +14179,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "selecţie" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -13976,7 +14189,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "incomplet" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14180,4 +14392,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" @@ -14206,12 +14419,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 @@ -14259,5 +14472,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14294,5 +14507,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14356,6 +14569,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 "" @@ -14501,6 +14715,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 "" @@ -15080,7 +15294,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 "" @@ -15293,6 +15507,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 "" @@ -16204,7 +16418,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" @@ -16252,23 +16463,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 "" @@ -16292,5 +16503,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" @@ -16337,22 +16547,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 "" @@ -16367,22 +16577,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 "" @@ -16397,22 +16607,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 "" @@ -16446,5 +16656,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 "" @@ -16691,5 +16901,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17074,7 +17284,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "la" +msgstr "" #. color tertiary @@ -17195,7 +17404,6 @@ #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "nod" +msgstr "" #: build/trans_presets.java:1737 @@ -17228,7 +17436,6 @@ #. item "Tourism/Audioguide" text "Name" #: build/trans_presets.java:1760 build/trans_presets.java:1770 -#, fuzzy msgid "Closer description" -msgstr "descrierea pistei gps" +msgstr "" #: build/trans_presets.java:1765 @@ -17566,5 +17773,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17598,5 +17805,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18722,6 +18929,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 "" @@ -18730,66 +18937,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -18798,76 +19005,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19199,5 +19406,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 "" @@ -19222,5 +19429,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 "" @@ -19228,5 +19435,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 "" @@ -19234,5 +19441,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 "" @@ -19240,5 +19447,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 "" @@ -19246,5 +19453,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 "" @@ -19303,10 +19510,137 @@ msgstr "" +#. item +#. +#. +#: build/trans_presets.java:2433 +msgid "Backrest" +msgstr "" + +#: build/trans_presets.java:2434 +msgid "Material" +msgstr "" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "nici unul" + +#: build/trans_presets.java:2434 +msgid "plastic" +msgstr "" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Culoare" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "urmă" + +#: build/trans_presets.java:2435 +msgid "brown" +msgstr "" + +#. 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 "" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Valoare" + +#: build/trans_presets.java:2435 +msgid "white" +msgstr "" + +#: 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 "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19315,30 +19649,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 "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "" @@ -19347,10 +19681,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "" @@ -19359,10 +19693,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19370,33 +19704,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 "" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2475 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2476 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19404,9 +19738,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "" @@ -19414,27 +19748,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2496 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2501 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2504 +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "" @@ -19442,5 +19776,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "" @@ -19448,88 +19782,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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "" @@ -19537,9 +19871,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "" @@ -19547,9 +19881,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "" @@ -19557,18 +19891,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19576,54 +19910,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19631,9 +19965,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19641,9 +19975,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19651,54 +19985,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 "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "" @@ -19706,9 +20040,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "" @@ -19716,9 +20050,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19726,32 +20060,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "" @@ -19759,14 +20093,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "" -#: 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 "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "" @@ -19774,5 +20108,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "" @@ -19780,15 +20114,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "" @@ -19796,18 +20130,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "" @@ -19815,5 +20149,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "" @@ -19821,9 +20155,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "" @@ -19831,10 +20165,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -19843,5 +20177,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -19850,20 +20184,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "" #. 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 "" @@ -19871,5 +20205,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 "" @@ -19878,55 +20212,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -19934,15 +20268,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "" @@ -19950,10 +20284,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "" @@ -19961,25 +20295,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -19987,5 +20321,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -19993,10 +20327,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "" @@ -20004,17 +20338,16 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "selectat" +msgstr "" #. item #. -#: build/trans_presets.java:2825 +#: build/trans_presets.java:2828 msgid "Edit Islet" msgstr "" @@ -20022,5 +20355,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "" @@ -20028,10 +20361,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "" @@ -20039,10 +20372,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "" @@ -20050,10 +20383,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "" @@ -20061,70 +20394,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "" @@ -20133,15 +20466,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "" @@ -20150,5 +20483,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "" @@ -20156,17 +20489,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 "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "" @@ -20175,14 +20508,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "" @@ -20190,25 +20523,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20216,10 +20549,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20227,5 +20560,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20233,5 +20566,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20240,45 +20573,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20286,25 +20619,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20312,10 +20645,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20323,20 +20656,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20344,5 +20677,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20350,15 +20683,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "" @@ -20366,9 +20699,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "" @@ -20376,39 +20709,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20416,15 +20749,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20432,55 +20765,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20490,5 +20823,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 "" @@ -20497,10 +20830,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20508,5 +20841,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20515,5 +20848,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20521,34 +20854,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20557,15 +20890,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20573,5 +20906,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20580,5 +20913,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20586,5 +20919,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20592,5 +20925,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20656,5 +20989,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 @@ -20663,17 +20996,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20726,5 +21059,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 @@ -20733,13 +21066,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20753,10 +21086,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20764,31 +21097,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20797,30 +21130,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -23973,76 +24306,4 @@ msgstr "" -#. 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 "" - #. color green #. @@ -25010,11 +25271,17 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la " -#~ "server." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Nu este nici un document deschis, nu este nimic de salvat." +#. 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 "Unknown version" +#~ msgstr "Versiune necunoscută" #~ msgid "Aborting..." @@ -25052,4 +25319,9 @@ #~ msgstr "Nume utilizator OSM (email)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la " +#~ "server." + #~ msgid "my version:" #~ msgstr "versiunea mea:" @@ -25058,7 +25330,4 @@ #~ msgstr "versiunea lor:" -#~ msgid "resolved version:" -#~ msgstr "rezolvat în versiunea:" - #~ msgid "true" #~ msgstr "adevărat" @@ -25081,4 +25350,7 @@ #~ msgid "unnamed" #~ msgstr "fără nume" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nu este nici un document deschis, nu este nimic de salvat." #~ msgid "Unknown file extension." Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 17594) +++ /applications/editors/josm/i18n/po/ru.po (revision 17595) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-09-04 18:39+0000\n" -"Last-Translator: Sergei Egorov \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-10 12:37+0000\n" +"Last-Translator: Fortress \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,10 +17,10 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\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" @@ -28,5 +28,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 @@ -35,18 +35,20 @@ msgstr "Справка" -#: ../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 "Невозможно активировать защиту {0}. Используется Меркатор" -#: ../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 @@ -62,8 +64,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 @@ -77,6 +79,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 @@ -86,5 +88,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 @@ -104,13 +106,13 @@ #: ../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 "Ошибка" -#: ../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?" @@ -118,44 +120,44 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" -"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" +"Присутствуют не сохранённые изменения на {0} слое. Отменить изменения и " +"продолжить?" msgstr[1] "" -"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" +"Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и " +"продолжить?" msgstr[2] "" -"Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +"Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и " +"продолжить?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../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 "Сохранить и выйти" -#: ../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 "Отменить и выйти" -#: ../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 @@ -164,11 +166,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 @@ -182,20 +185,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 "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{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 @@ -212,16 +215,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 @@ -251,15 +254,17 @@ msgstr "Предупреждение" -#: ../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 "Игнорируется неверный адрес файла: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Невозможно прочесть файл: ''{0}''. Ошибка в:
{1}" +msgstr "Не удалось прочитать файл ''{0}''.
Ошибка:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -346,5 +351,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 "Модули" @@ -359,22 +364,21 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на " -"страницу истории OSM примитива вероятно не выполнено. Базовый URL API: " -"''{0}''" +"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат адреса базы API. Перенаправление на " +"страницу информации или истории изменений OSM-примитива невозможно. Адрес " +"базы API: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на " -"страницу истории OSM примитива вероятно не выполнено. Базовый URL API: " -"''{0}''" +"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат адреса базы API. Перенаправление на " +"персональную страницу OSM-пользователя невозможно. Адрес базы API: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -485,9 +489,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 @@ -521,6 +525,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 @@ -539,11 +543,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 "Информация" @@ -566,5 +570,5 @@ msgstr "Выделите не менее трёх точек." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -575,10 +579,10 @@ "- {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" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -589,5 +593,5 @@ "примитиве {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -598,9 +602,9 @@ "допустимую длину {2}. Значение длины {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Нарушение предусловия" -#: ../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}" @@ -655,76 +659,60 @@ msgstr "Нет конфликтов чтобы их показать." -#: ../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 "Объединить линию" -#: ../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 "Объединить несколько линий в одну." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Объединить линии, входящие в разные отношения?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"У выделенных линий различается участие в отношениях. Всё равно хотите их " +"объединить?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Изменить направления?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Перевернуть и объеденить" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Линии с их текущими направлениями не объединить. Обратить некоторые линии?" + +#: ../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 "" +"Не удаётся объединить линии: они не могут быть представлены одной " +"последовательностью точек." + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Объединить {0} линии" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Объединить линии, входящие в разные отношения?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Объединить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"У выделенных линий различается участие в отношениях. Всё равно хотите их " -"объединить?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Изменить направления?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Перевернуть и объеденить" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Линии с их текущими направлениями не объединить. Обратить некоторые линии?" - -#: ../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 "Введите значения для всех конфликтов." - -#: ../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 "Решение конфликтов" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Объединить {0} линии" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Все линии были пустыми" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Не удаётся объединить линии: они не могут быть представлены одной " -"последовательностью точек." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -778,5 +766,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 "Удалить" @@ -786,15 +774,15 @@ msgstr "Удалить выделенные объекты." -#: ../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 "Перезаписать" -#: ../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 "Файл уже существует. Перезаписать?" @@ -823,10 +811,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}" @@ -857,5 +845,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 @@ -898,7 +886,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Все изображения" +msgstr "Все форматы" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1036,1083 +1023,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 "Объединить точки" -#: ../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 "Объединить точки в одну (более старую)" -#: ../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 "Пожалуйста, выберите как минимум две точки для объединения." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Объединить точки из разных отношений?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Объединить в любом случае" - -#: ../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 "" -"Выделенные точки участвуют в различных отношениях. Всё равно хотите " -"объединить?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Не удаётся объединить точки: пришлось бы удалить линию, которая еще " -"используется." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Объединить {0} точек" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Соединить выделение" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Объедините выбранные примитивы в другой слой" - -#: ../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 "Зеркало" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Зеркало выбранных узлов и путей." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Пожалуйста, выберите хотябы один узел или путь." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "вверх" - -#: ../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 "Переместить объекты {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "вниз" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "влево" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "вправо" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Переместить {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Перемещает объекты {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 "Невозможно переместить объекты за пределы мира." - -#: ../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 "Создать" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Создать новую карту." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Открыть..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Открыть файл." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Открыть файл." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Неизвестная роль «{0}»." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Открыть адрес..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Открыть ссылку." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "На отдельный слой" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Введите URL для загрузки:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Путь загрузки" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Загрузить URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Сделать углы прямыми" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "" -"Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 " -"градусов" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Возможно выбрать только две точки" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Возможно выбирать только линии." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" -"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех " -"точек." - -#: ../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 "Выбрана только одна точка" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Сделать углы прямыми" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "Вставить" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Вставить содержимое буфера." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Вставить тэги" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Применить тэги из буфера ко всем выделенным объектам." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Загрузка {0}" -msgstr[1] "Загрузка {0}" -msgstr[2] "Загрузка {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Отменить удаление {0} примитивов" -msgstr[1] "Отменить удаление {0} примитивов" -msgstr[2] "Отменить удаление {0} примитивов" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Настройки..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Изменить настройки программы" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Настройки" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Вернуть" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Вернуть последнее отменённое действие." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Переименовать слой" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Переименовать файл" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Не возможно переименовать файл ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Изменить направление линии" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Изменить направление линии на противоположное." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Пожалуйста, выберите как минимум одну линию." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Изменить направление линии" - -#: ../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 "Сохранить" - -#: ../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 "Сохранить текущие данные." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Файл {0} существует. Перезаписать?" - -#: ../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 "Пустой документ" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "В документе не содержиться данных" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Сохранить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Конфликты" - -#: ../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 "" -"Имеются неразрешенные конфликты. Конфликтующие объекты не будут сохранены и " -"будут обработаны, как будто вы отменили их все. Продолжить?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Отказаться от конфликтов и сохранить" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Сохранить файл OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Сохранить файл GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Сохранить слой" - -#: ../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 "Сохранить как..." - -#: ../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 "Сохранить текущие данные в новый файл." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Выбрать всё" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Выделить все восстановленные объекты слоя данных. Также будут выделены " -"незаконченные объекты." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Показать отчёт о состоянии" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Отображает отчёт о состоянии, содержащий полезную информацию, которую можно " -"прикрепить к сообщению об ошибке" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Справка: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Отчёт о состоянии" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Скопировать в буфер и закрыть" - -#: ../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 "Закрыть" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Разделить линию" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Разделить линию в выбранной точке." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Текущее выделение невозможно разделить." - -#: ../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] "Выбранная точка не является частью пути." -msgstr[1] "Выбранная точка не является частью пути." -msgstr[2] "Выбранные точки не являются частью пути." - -#: ../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] "" -"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста " -"выберите путь ещё.\r\n" -"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста " -"выберите путь ещё." -msgstr[1] "" -"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста " -"выберите путь ещё." -msgstr[2] "" -"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста " -"выберите путь ещё." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Выбранные точки не являются частью одной линии." - -#: ../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] "Выбранная линия не содержит выбранной точки" -msgstr[1] "Выбранная линия не содержит выбранных точек" -msgstr[2] "Выбранная линия не содержит выбранных точек" - -#: ../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 "Чтобы разделить замкнутую линию, выберите две или более точки." - -#: ../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 "" -"Линию невозможно разделить в выделенных точках. (Выберите точки в середине " -"линии)" - -#: ../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 "Разделить линию {0} на {1} частей" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Закрывается список правок..." - -#: ../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 "Закрывается список правок..." - -#: ../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 "Открывается список правок..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "Показать/скрыть линии GPX" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Отображать линии между точками трэков GPS" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Включает/выключает глобальную установку: «{0}»." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Разъединить линии" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Дублировать точки, используемые несколькими линиями." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Данная точка не связана с чем-либо еще." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ни одна из этих точек не притянута к другим." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ни одна из этих линий не притянута к другим." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Выделенные объекты невозможно разъединить" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Выберите один из вариантов:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Одна точка с тэгами, или" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Одна точка, используемая несколькими линиями, либо" - -#: ../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 "" -"* Одна точка, используемая несколькими линиями и одной из этих линий, либо" - -#: ../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 "* Одна линия, имеющая точки, используемые несколькими линиями, либо" - -#: ../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 "" -"* Одна линия, и одна или несколько её точек, которые используются " -"несколькими линиями." - -#: ../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 "" -"Прим.: Если выбрана линия, она получит дубликаты узлов, \n" -"и они будут выбраны. В противном случае, все линии получат\n" -"дубликаты точек, и все точки будут выбраны" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Неприкрепленная точка" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Дублировать в {0} точек" - -#. 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 "Дублировать {0} точек в {1} точек" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Отмена" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Отменить последнее действие." - -#: ../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 "Снять выделение" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Снять выделение со всех объектов." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Снять выделение со всего (Фокус)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Снять выделение со всего (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Обновить данные" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Обновить слой данных с сервера (скачать данные заново)" - -#. 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 "Обновление данных" - -#: ../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 "Не найден примитив с id {0} в текущем наборе данных" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Обновить выборку" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Обновить выбранные примитивы с сервера" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Не выбраны примитивы для обновления." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Выборка пуста" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Загрузить на OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Загрузить все изменения на OSM" - -#: ../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 "Присутствуют неразрешённые конфликты. Для начала, разрешите их" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Нечего загружать. Сначала создайте данные." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Нет изменений для загрузки." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Синхронизированы только {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 "Синхронизировать весь набор данных" - -#: ../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 "" -"Загрузка прервана так как на сервере есть более новая " -"версия одной
из ваших точек, путей или отношений.
Причиной конфликта " -"является {0} с id {1},
версия данных на " -"сервере {2}, ваша версия {3}.

Нажмите {4} что бы " -"синхронизировать только конфликтный примитив.
Нажмите {5} что бы синхронизировать весь локальный набор данных с сервером." -"
Нажмите {6} что бы прекратить и продолжить " -"редактирование.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Обнаружен конфликт" - -#. 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 "неожиданное возвращённое значение. Получено {0}" - -#: ../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 "" -"Ошибка обновления, так как на сервере имеется более " -"новая версия одного
из ваших узлов, путей или отношений.

. " -"Нажмите на {0} для синхронизации локальных данных с " -"сервером.
Нажмите {1} для прерывания и продолжения " -"редактирования.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Предупреждение: заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}" -"\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Не удалось загрузить данные.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Ошибка выгрузки в OSM API" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Обновление примитива" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Загрузить эти изменения?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Загрузить изменения" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Изменить новое отношение в слое ''{0}''" - -#: ../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 "Добавить точку к линии" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "Выгрузить все изменения за один запрос" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишите изменения для закачиваемых данных:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Настройки карты" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "набор изменений" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Новые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Изменённые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Удаляемые объекты:" - -#: ../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] "Новые объекты:" -msgstr[1] "Новые объекты:" -msgstr[2] "Новые объекты:" - -#: ../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] "Изменённые объекты:" -msgstr[1] "Изменённые объекты:" -msgstr[2] "Изменённые объекты:" - -#: ../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] "Удаляемые объекты:" -msgstr[1] "Удаляемые объекты:" -msgstr[2] "Удаляемые объекты:" - -#: ../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 "Последние изменения: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Увеличить масштаб" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Уменьшить масштаб" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Назад" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Перемотать назад." - -#: ../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 "Звук: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Быстрее" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Играть быстрее." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Вперёд" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Перемотать вперёд" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Следующий маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Воспроизвести следующий маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Воспроизвести/пауза" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Воспроизвести/пауза" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Предыдущий маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Воспроизвести предыдущий маркер" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Медленнее" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Играть медленнее." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Скачивание данных GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Скачанные GPX данные" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Данные GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Загрузка данных" - -#: ../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 "Данные не импортированы" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Данные OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Скачивание {0} из {1} ({2} осталось)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Ошибка в течение загрузки" - -#: ../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 "" -"{0} примитив(ов) в вашем наборе данных которые
могут быть удалены " -"на сервере. В дальнейшем, если вы попытаетесь удалить или
обновить их, " -"сервер скорее всего сообщит о
конфликте.

Нажмите {1} что бы проверить состояние этих примитивов
на сервере.
Нажмите " -"{2} что бы проигнорировать.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Удалённые или перемещённые примитивы" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Режим удаления" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Удалить точки или линии." - -#: ../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 "Режим: {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 "" -"Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять " -"неиспользуемые точки при удалении линии. Ctrl: удалить линию, но оставить " -"точки." - +#: ../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 @@ -2123,7 +1052,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 @@ -2132,6 +1062,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 @@ -2162,4 +1092,924 @@ msgstr "параметр ''{0}'' не должен быть 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 "" +"Не удаётся объединить точки: пришлось бы удалить линию, которая еще " +"используется." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Объединить {0} точек" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Соединить выделение" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Объедините выбранные примитивы в другой слой" + +#: ../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 "Зеркало" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Зеркало выбранных узлов и путей." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Пожалуйста, выберите хотябы один узел или путь." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "вверх" + +#: ../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 "Переместить объекты {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "вниз" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "влево" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "вправо" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Переместить {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Перемещает объекты {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 "Невозможно переместить объекты за пределы мира." + +#: ../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 "Создать" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Создать новую карту." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Открыть..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Открыть файл." + +#: ../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 "Открытие файла ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Открыть адрес..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Открыть ссылку." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "На отдельный слой" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Введите URL для загрузки:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Путь загрузки" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Загрузить URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Сделать углы прямыми" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "" +"Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 " +"градусов" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Возможно выбрать только две точки" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Возможно выбирать только линии." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" +"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех " +"точек." + +#: ../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 "Выбрана только одна точка" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Сделать углы прямыми" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "Вставить" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Вставить содержимое буфера." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Вставить тэги" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Применить тэги из буфера ко всем выделенным объектам." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Вставляется {0} тег" +msgstr[1] "Вставляется {0} тега" +msgstr[2] "Вставляется {0} тегов" + +#: ../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 "Настройки..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Изменить настройки программы" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Настройки" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Вернуть" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Вернуть последнее отменённое действие." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Переименовать слой" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Переименовать файл" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Не возможно переименовать файл ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Изменить направление линии" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Изменить направление линии на противоположное." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Пожалуйста, выберите как минимум одну линию." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Изменить направление линии" + +#: ../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 "Сохранить" + +#: ../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 "Сохранить текущие данные." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Файл {0} существует. Перезаписать?" + +#: ../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 "Пустой документ" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Сохранить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "В документе не содержиться данных" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Конфликты" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Отказаться от конфликтов и сохранить" + +#: ../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 "" +"Имеются неразрешенные конфликты. Конфликтующие объекты не будут сохранены и " +"будут обработаны, как будто вы отменили их все. Продолжить?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Сохранить файл OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Сохранить файл GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Сохранить слой" + +#: ../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 "Сохранить как..." + +#: ../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 "Сохранить текущие данные в новый файл." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Выбрать всё" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Выделить все восстановленные объекты слоя данных. Также будут выделены " +"незаконченные объекты." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Показать отчёт о состоянии" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Отображает отчёт о состоянии, содержащий полезную информацию, которую можно " +"прикрепить к сообщению об ошибке" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Справка: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Отчёт о состоянии" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Скопировать в буфер и закрыть" + +#: ../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 "Закрыть" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Разделить линию" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Разделить линию в выбранной точке." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Текущее выделение невозможно разделить." + +#: ../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] "Выбранная точка не является частью пути." +msgstr[1] "Выбранная точка не является частью пути." +msgstr[2] "Выбранные точки не являются частью пути." + +#: ../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] "" +"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста " +"выберите путь ещё.\r\n" +"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста " +"выберите путь ещё." +msgstr[1] "" +"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста " +"выберите путь ещё." +msgstr[2] "" +"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста " +"выберите путь ещё." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Выбранные точки не являются частью одной линии." + +#: ../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] "Выбранная линия не содержит выбранной точки" +msgstr[1] "Выбранная линия не содержит выбранных точек" +msgstr[2] "Выбранная линия не содержит выбранных точек" + +#: ../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 "Чтобы разделить замкнутую линию, выберите две или более точки." + +#: ../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 "" +"Линию невозможно разделить в выделенных точках. (Выберите точки в середине " +"линии)" + +#: ../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 "Разделить линию {0} на {1} частей" + +#: ../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 "Показать/скрыть линии GPX" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Отображать линии между точками трэков GPS" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Включает/выключает глобальную установку: «{0}»." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Разъединить линии" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Дублировать точки, используемые несколькими линиями." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Данная точка не связана с чем-либо еще." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ни одна из этих точек не притянута к другим." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ни одна из этих линий не притянута к другим." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Выделенные объекты невозможно разъединить" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Выберите один из вариантов:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Одна точка с тэгами, или" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Одна точка, используемая несколькими линиями, либо" + +#: ../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 "" +"* Одна точка, используемая несколькими линиями и одной из этих линий, либо" + +#: ../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 "* Одна линия, имеющая точки, используемые несколькими линиями, либо" + +#: ../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 "" +"* Одна линия, и одна или несколько её точек, которые используются " +"несколькими линиями." + +#: ../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 "" +"Прим.: Если выбрана линия, она получит дубликаты узлов, \n" +"и они будут выбраны. В противном случае, все линии получат\n" +"дубликаты точек, и все точки будут выбраны" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Неприкрепленная точка" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Дублировать в {0} точек" + +#. 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 "Дублировать {0} точек в {1} точек" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Отмена" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Отменить последнее действие." + +#: ../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 "Снять выделение" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Снять выделение со всех объектов." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Снять выделение со всего (Фокус)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Снять выделение со всего (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Обновить данные" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Обновить слой данных с сервера (скачать данные заново)" + +#. 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 "Обновление данных" + +#: ../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 "Не найден примитив с id {0} в текущем наборе данных" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Обновить выборку" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Обновить выбранные примитивы с сервера" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Не выбраны примитивы для обновления." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Выборка пуста" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Загрузить на OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Загрузить все изменения на OSM" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Присутствуют неразрешённые конфликты на слое ''{0}''.
Необходимо " +"сначала разрешить их." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Нечего загружать. Сначала создайте данные." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Нет изменений для загрузки." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Синхронизированы только {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 "Синхронизировать весь набор данных" + +#: ../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 "" +"Загрузка прервана так как на сервере есть более новая " +"версия одной
из ваших точек, путей или отношений.
Причиной конфликта " +"является {0} с id {1},
версия данных на " +"сервере {2}, ваша версия {3}.

Нажмите {4} что бы " +"синхронизировать только конфликтный примитив.
Нажмите {5} что бы синхронизировать весь локальный набор данных с сервером." +"
Нажмите {6} что бы прекратить и продолжить " +"редактирование.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Обнаружен конфликт" + +#. 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 "неожиданное возвращённое значение. Получено {0}" + +#: ../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 "" +"Ошибка обновления, так как на сервере имеется более " +"новая версия одного
из ваших узлов, путей или отношений.

. " +"Нажмите на {0} для синхронизации локальных данных с " +"сервером.
Нажмите {1} для прерывания и продолжения " +"редактирования.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Предупреждение: заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}" +"\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Не удалось загрузить данные.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Ошибка выгрузки в OSM API" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Обновление примитива" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Выгрузка данных по слою ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Увеличить масштаб" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Уменьшить масштаб" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Назад" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Перемотать назад." + +#: ../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 "Звук: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Быстрее" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Играть быстрее." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Вперёд" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Перемотать вперёд" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Следующий маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Воспроизвести следующий маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Воспроизвести/пауза" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Воспроизвести/пауза" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Предыдущий маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Воспроизвести предыдущий маркер" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Медленнее" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Играть медленнее." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Скачивание данных GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Скачанные GPX данные" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Данные GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Загрузка данных" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "Ошибка игнорируется, так как загрузка была отменена. Текст ошибки: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Данные не импортированы" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Данные OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Скачивание {0} из {1} ({2} осталось)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Во время пакетной загрузки обнаружены следующие ошибки:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Ошибка в течение загрузки" + +#: ../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 "" +"{0} примитив(ов) в вашем наборе данных которые
могут быть удалены " +"на сервере. В дальнейшем, если вы попытаетесь удалить или
обновить их, " +"сервер скорее всего сообщит о
конфликте.

Нажмите {1} что бы проверить состояние этих примитивов
на сервере.
Нажмите " +"{2} что бы проигнорировать.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Удалённые или перемещённые примитивы" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Режим удаления" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Удалить точки или линии." + +#: ../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 "Режим: {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 "" +"Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять " +"неиспользуемые точки при удалении линии. Ctrl: удалить линию, но оставить " +"точки." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2276,18 +2126,18 @@ "этой точке" -#: ../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 "Выбор" -#: ../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" @@ -2297,18 +2147,18 @@ msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2316,10 +2166,11 @@ "Really move them?" msgstr "" -"Перемещено больше чем {0} элементов. Перемещение такого количество элементов " -"часто является ошибкой. Действительно переместить?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +"Вы переместили более {0} элементов. Перемещение большого количества " +"элементов\n" +"часто производится по ошибке. Действительно переместить их?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Всегда перемещать и больше не показывать этого предупреждения" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2369,5 +2220,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51 msgid "Can't search because there is no loaded data." -msgstr "" +msgstr "Поиск невозможен, так как не загружено никаких данных." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 @@ -2441,7 +2292,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - объект с заданным ID" +msgstr "id:... - объект с данным ID (0 для новых объектов)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2463,5 +2313,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "untagged - all untagged objects" -msgstr "без тэгов - все объекты без тэгов" +msgstr "untagged - все объекты без тэгов" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 @@ -2500,41 +2350,41 @@ msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Начать поиск" -#: ../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 "Не найдено совпадений для ''{0}''" -#: ../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 "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../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 "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../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 "Найдено {0} совпадений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2547,5 +2397,5 @@ "{2}" -#: ../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 "" @@ -2553,10 +2403,10 @@ "использования: ключ=значение" -#: ../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 "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" -#: ../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" @@ -2564,26 +2414,26 @@ "Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" -#: ../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 "Неожиданный знак: {0}" -#: ../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 "" @@ -2594,5 +2444,5 @@ "или диапазон, например, 10-20" -#: ../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." @@ -2629,62 +2479,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Добавить точку" +msgstr "Добавить точку {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Добавить {0} {1}" +msgstr "Добавить линию {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Отношений: {0}" +msgstr "Добавить отношение {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Изменить {0} {1}" +msgstr "Изменить точку {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Изменить {0} {1}" +msgstr "Изменить линию {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Изменить отношение" +msgstr "Изменить отношение {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Удалить \"{0}\" для {1} ''{2}''" +msgstr "Удалить \"{0}\" для точки ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Удалить \"{0}\" для {1} ''{2}''" +msgstr "Удалить \"{0}\" для линии ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Удалить \"{0}\" для {1} ''{2}''" +msgstr "Удалить \"{0}\" для отношения ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Установить {0}={1} для {2} ''{3}''" +msgstr "Задать {0}={1} для точки ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Установить {0}={1} для {2} ''{3}''" +msgstr "Задать {0}={1} для линии ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Установить {0}={1} для {2} ''{3}''" +msgstr "Задать {0}={1} для отношения ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2755,34 +2605,34 @@ #: ../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] "Удалить {0} {1}" -msgstr[1] "Удалить {0} {1}" -msgstr[2] "Удалить {0} {1}" +msgstr[0] "Удалить {0} объект" +msgstr[1] "Удалить {0} объекта" +msgstr[2] "Удалить {0} объектов" #: ../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] "Режим удаления" -msgstr[1] "Режим удаления" -msgstr[2] "Режим удаления" +msgstr[0] "Удалить {0} точку" +msgstr[1] "Удалить {0} точки" +msgstr[2] "Удалить {0} точек" #: ../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] "Удалить {0} {1}" -msgstr[1] "Удалить {0} {1}" -msgstr[2] "Удалить {0} {1}" +msgstr[0] "Удалить {0} линию" +msgstr[1] "Удалить {0} линии" +msgstr[2] "Удалить {0} линий" #: ../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] "Удалить из связи" -msgstr[1] "Удалить из связи" -msgstr[2] "Удалить из связи" +msgstr[0] "Удалить {0} отношение" +msgstr[1] "Удалить {0} отношения" +msgstr[2] "Удалить {0} отношений" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2796,20 +2646,20 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n" -"Удалить из отношения?" +"Выбранный объект \"{0}\" является частью отношения \"{1}\" в роли {2}." +"
Удалить из отношения?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Выделенный объект \"{0}\" используется отношением \"{1}\".\n" -"Удалить из отношения?" +"Выбранный объект \"{0}\" является частью отношения \"{1}\".
Удалить " +"из отношения?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2820,5 +2670,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." @@ -2843,6 +2693,7 @@ msgid "Move {0} node" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Переместить {0} точку" +msgstr[1] "Переместить {0} точки" +msgstr[2] "Переместить {0} точек" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 @@ -2877,15 +2728,15 @@ #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Удалить точку ''{0}'' в позиции {1} из отношения ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Удалить линию ''{0}'' в позиции {1} из отношения ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Удалить отношение ''{0}'' в позиции {1} из отношения ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2893,6 +2744,7 @@ msgid "Rotate {0} node" msgid_plural "Rotate {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Повернуть {0} точку" +msgstr[1] "Повернуть {0} точки" +msgstr[2] "Повернуть {0} точек" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 @@ -2901,17 +2753,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Устранить конфликты тега {0} в {1}{2}" +msgstr "Разрешить {0} конфликтующих тегов в точке {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Устранить конфликты тега {0} в {1}{2}" +msgstr "Разрешить {0} конфликтующих тегов в линии {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Устранить конфликты тега {0} в {1}{2}" +msgstr "Разрешить {0} конфликтующих тегов в отношении {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2921,17 +2773,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Устранить конфликты версии для {0}{1}" +msgstr "Разрешить конфликт версий для точки {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Устранить конфликты версии для {0}{1}" +msgstr "Разрешить конфликт версий для линии {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Устранить конфликты версии для {0}{1}" +msgstr "Разрешить конфликт версий для отношения {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3013,5 +2865,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "Ошибка: не удается сохранить свойства для ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 @@ -3069,9 +2921,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3102,4 +2954,6 @@ "{1}" msgstr "" +"Не удалось загрузить закладки с ''{0}'' в свези с проблемами безопасности. " +"Текст ошибки: {1}" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 @@ -3138,28 +2992,53 @@ 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 msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 +msgstr "Пакет изменений {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323 #, java-format msgid "parameter {0} > 0 required. Got {1}." msgstr "параметр {0} должен быть > 0. Текущее значение {1}." -#: ../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 "параметр ''{0}'' не должен быть null" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Нет полезного значения ''{0}'' для пути ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Ошибка: {0}" -#: ../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 "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "неожиданное возвращённое значение. Получено {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257 msgid "a primitive with id=0 can't be invisible" -msgstr "" +msgstr "примитив с id=0 не может быть невидимым" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "Неожиданный знак: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "Неожиданный знак: {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3173,11 +3052,18 @@ msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''" -#: ../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 "" @@ -3228,9 +3114,9 @@ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" -#: ../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." @@ -3239,118 +3125,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 "В отношении «{0}» имеется член, который был удален." -#: ../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 "Путь «{0}» имеет меньше двух точек." -#: ../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 "Найден больше чем один \"from\"" -#: ../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 "Найден больше чем один \"to\"" -#: ../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 "Найден больше чем один \"via\"" -#: ../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 "Неизвестная роль «{0}»." -#: ../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 "Неизвестный тип членства для «{0}»." -#: ../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 "Не найден путь \"from\"" -#: ../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 "Не найден путь \"to\"" -#: ../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 "Не найдена \"via\" точка или путь" -#: ../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 "\"from\" путь не начинается или заканчивается на \"via\" точке." -#: ../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 "\"to\" путь не начинается или заканчивается на \"via\" точке." -#: ../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 "\"from\" путь не начинается или заканчивается на \"via\" пути." -#: ../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 "\"to\" путь не начинается или заканчивается на \"via\" пути." -#: ../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 "Стиль для ограничения {0} не найден." -#: ../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 "Нет полезного значения ''{0}'' для пути ''{1}''." -#: ../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 "не-линия ''{0}'' в мультиполигональном отношении" -#: ../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 "Для мультиполигона «{0}» отсутствует внешний путь." -#: ../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 "Перекрёсток между линиями ''{0}'' и ''{1}''." -#: ../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 "Внутренний путь «{0}» находится снаружи." -#: ../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 "Стиль для внутренней ''{0}''одинаков с мультиполигоном." -#: ../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 "Стиль для внешней границы ''{0}'' отсутствует." -#: ../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 "текст" @@ -3376,5 +3262,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" @@ -3386,5 +3272,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" @@ -3396,5 +3282,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" @@ -3478,12 +3364,13 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Невозможно прочесть файл: ''{0}''. Ошибка в:
{1}" +msgstr "" +"Невозможно прочесть закладки с
''{0}''
Текст ошибки: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "Невозможно записать закладку.
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 @@ -3509,5 +3396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "железная дорога" @@ -3541,137 +3428,34 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Ошибка создания подключения к серверу OSM {0}.\n" -"Проверьте в настройках URL сервера и наличие подключения к сети Internet." - -#. 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 "неизвестный" - -#: ../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 "" -"Ошибка выгрузки данных на сервер, так как ваши " -"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Нарушение предварительного условия" +#: ../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 "" -"Невозможно установить соединение с удаленным сервером
''{0}''." -"
Пожалуйста проверьте свое подключение к интернету." - -#: ../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 +#, fuzzy +msgid "Bad Request" +msgstr "Редактировать Ракетка" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Неизвестный хост" -#: ../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 "" -"Ошибкапри выгрузке данных, примитив который вы " -"пытаетесь удалить
уже удаленн с сервера.

Сообщение об ошибке:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Примитив уже удален" @@ -3815,9 +3599,9 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "системные настройки Java" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/путь/до/каталога/JOSM/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3831,4 +3615,7 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"примечание: Для некоторых задач JOSM требуется много опеативной памяти. " +"Возможно необходимо добавить следующие\n" +" настройки Java для увеличения максимально размера используемой памяти" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3892,5 +3679,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}" @@ -4284,4 +4071,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 @@ -4361,8 +4150,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 @@ -4493,5 +4282,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 "удалён" @@ -4551,10 +4340,10 @@ #: ../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 "Нет, прервать" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4562,7 +4351,4 @@ "yo agree?" msgstr "" -"Что бы оставить вашу локальную версию, JOSM
должен сбросить " -"значение id {0} {1} в 0.
Во время следующей загрузки на сервер, сервер " -"присвоит
новое значение id.
Вы согласны?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4596,4 +4382,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 @@ -4607,5 +4394,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 "" @@ -4711,4 +4498,40 @@ msgstr "Их набор данных не содержит тег с ключом {0}" +#: ../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 "Нет неразрешённых конфликтов тегов" + +#: ../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 @@ -4721,24 +4544,23 @@ msgstr "все" -#: ../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 "Выбор цвета" - -#: ../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 -#, fuzzy, java-format +#: ../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 "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4746,12 +4568,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "параметр ''{0}'' не должен быть null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4759,15 +4581,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../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 +msgstr "" + +#: ../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 "Ещё не реализовано." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4776,17 +4598,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "с улицы" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Удалить из связи" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Конфликт в данных" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4812,24 +4631,8 @@ msgstr[2] "{0} отношений" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Разрешение конфликтов" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Устранить конфликт" - -#: ../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 "Вставить" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4844,10 +4647,75 @@ #: ../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} линия" -msgstr[1] "{0} линии" -msgstr[2] "{0} линий" +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 "Удалить текущего участника из отношения" + +#: ../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 "место" + +#: ../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 +#, fuzzy +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 "Значение" + +#: ../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 "Односторонняя" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Версия" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4874,5 +4742,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}" @@ -4903,5 +4771,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." @@ -4974,13 +4842,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 "Слой: {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 "Отношений: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5067,5 +4935,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 "<различные>" @@ -5125,5 +4993,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 "Добавить" @@ -5173,5 +5041,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 "Отношения" @@ -5266,10 +5134,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] "Автор" -msgstr[1] "Автор" -msgstr[2] "Автор" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5278,20 +5145,16 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Показать" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Подробнее" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных " -"примитивов" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5366,5 +5229,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}" @@ -5383,9 +5246,4 @@ msgid "Child Relations" msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Роль:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5643,11 +5501,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 "" @@ -5661,7 +5519,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Редактировать отношения" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5714,5 +5571,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107 msgid "Select a bookmark first." -msgstr "Сначала выберите закладку." +msgstr "Сначала выберите закладку" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 @@ -5788,5 +5645,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Места" @@ -5864,9 +5721,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " +"Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5896,17 +5756,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "История для {0}{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "История для {0}{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "История для {0}{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5915,7 +5775,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Показать историю выделенного примитива" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5948,22 +5807,22 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Загрузка истории для {0} с id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Загрузка истории для {0} с id {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Загрузка истории для {0} с id {1}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6798,78 +6657,74 @@ #: 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 "Название" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Версия {0} дата создания: {1} автор: " -"{2}" +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "набор изменений" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Подробнее" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Последние изменения: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6887,7 +6742,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Название улицы" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6928,12 +6782,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Выберите значение" +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 "Слой ''{0}'' должен быть в списке слоёв" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6975,10 +6828,9 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Инсправить конфликт тегов" +msgid "Unsaved data and conflicts" +msgstr "Устранить конфликт" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6993,8 +6845,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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 "" @@ -7011,8 +6862,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -7026,7 +6876,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Отменить и выйти" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7039,7 +6888,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Сохранить и выйти" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7117,7 +6965,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "При загрузке" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7126,17 +6973,159 @@ #: ../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 "Выгрузить все изменения за один запрос" + +#: ../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 "" +"Включите, чтобы выгрузить все изменения за один запрос, отключите, чтобы " +"делать отдельный запрос для каждого изменённого примитива" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Опишите изменения для закачиваемых данных:" + +#: ../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 "Новые объекты:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Изменённые объекты:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Удаляемые объекты:" + +#: ../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] "Добавить {0} объект:" +msgstr[1] "Добавить {0} объекта:" +msgstr[2] "Добавить {0} объектов:" + +#: ../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] "Изменить {0} объект:" +msgstr[1] "Изменить {0} объекта:" +msgstr[2] "Изменить {0} объектов:" + +#: ../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] "Удалить {0} объект:" +msgstr[1] "Удалить {0} объекта:" +msgstr[2] "Удалить {0} объектов:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Использовать текущий набор изменений {0} и закрыть его после загрузки" + +#: ../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 "" +"Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть его " +"после загрузки" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "Использовать текущий список изменений {0} и оставить открытым" + +#: ../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 "" +"Выберите, чтобы использовать существующий пакет изменений {0}, и оставить " +"его открытым после загрузки" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Теги пакета изменений {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Загрузить изменения" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Файл" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Загрузить эти изменения?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Выгрузка" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Пожалуйста, введите название места." + +#: ../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 +#, fuzzy +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 "Не выбраны примитивы для обновления." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7373,5 +7362,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." @@ -7429,7 +7417,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Загрузка данных" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7495,4 +7482,13 @@ msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" + +#: ../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 "" +"Загрузка на карту необработанных данных GPS считается вредоносной." +"
Если хотите загрузить трэк, сделайте это по ссылке:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7693,5 +7689,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 "Пожалуйста, выберите ряд для удаления." @@ -8176,7 +8172,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Показывать ID объектов в списке выбора" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8191,7 +8186,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Показывать ID объектов в списке выбора" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8564,8 +8558,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!" @@ -8622,5 +8612,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 @@ -8632,42 +8622,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Добавить новый слой" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Удалить выбранный слой." - -#: ../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 "Подробнее" #. 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 "Дополнительные атрибуты:" -#: ../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 "Использовать шаблон ''{0}'' из группы ''{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 "Использовать шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "замкнутая" -#: ../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 "Неизвестный тип: {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 @@ -8678,15 +8666,15 @@ msgstr "Не удалось прочитать помеченные настройки исходника: {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 "Ошибка при разборе {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 "Элемент типа {0} не поддерживается." -#: ../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 @@ -8697,18 +8685,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../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 "Ничего не выбрано!" -#: ../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 "Изменить параметры" @@ -8735,5 +8723,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 "Ошибка! Возможно отсутствуют тэги." @@ -8749,7 +8736,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 @@ -8827,5 +8811,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}" @@ -8833,5 +8817,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" @@ -8839,5 +8823,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" @@ -8858,6 +8841,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 @@ -8867,40 +8850,40 @@ msgstr "Скачивание данных OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Изменить отношение #{0} в слое ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8966,10 +8949,10 @@ msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../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 "сервер вернул неожиданный формат id, текущее значение \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8979,11 +8962,9 @@ "значение \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Открывается список правок..." - -#: ../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}" @@ -8991,34 +8972,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 "Открывается список правок..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Открывается список правок..." - -#: ../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 "Открывается список правок..." - -#: ../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 " @@ -9026,44 +8991,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Закрывается список правок..." -#: ../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 "Закрывается список правок..." - -#: ../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 "Открывается список правок..." - -#: ../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 "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Закачка..." -#: ../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}." @@ -9082,10 +9047,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 "Файлы сервера OSM сжаты с помощью bzip2" -#: ../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 "bz2 файл содержит ошибки" @@ -9146,6 +9111,11 @@ "
Не используйте важные Пароли. element not as direct child of element " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "обязательный атрибут ''{0}'' отсутствует" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Найден элемент вне пути." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "у нет ссылок ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Найден тэг вне отношения." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "Отсутствует атрибут \"ref\" участника отношения {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" msgstr "" "Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение " "{1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" +msgstr "Отсутствует атрибут \"ref\" участника отношения {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" +"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение " +"{1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Отсутствует атрибут \"type\" участника {0} в отношении {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" +"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение " +"{1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Недопустимый объект с 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Неверное значение атрибута \"version\" OSM примитива с id {0}, текущее " "значение {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Версия неизвестна: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Отсутствует необходимый атрибут \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " +"''{1}''" + +#: ../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 "" @@ -9323,16 +9366,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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../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 "Подготовка данных..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Подготовка данных..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9379,33 +9436,43 @@ "соединение." -#: ../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} осталось. Загрузка {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} осталось. Загрузка {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} осталось. Загрузка {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 "Закачка..." + +#: ../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 "Нечего загружать. Сначала создайте данные." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9444,12 +9511,7 @@ msgstr "Загрузка Плагина {0}..." -#: ../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 "JOSM версии {0} требует плагин {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9461,4 +9523,9 @@ msgstr "Пропустить Загрузку" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM версии {0} требует плагин {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9500,20 +9567,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 "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../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 " @@ -9523,5 +9590,9 @@ "разрешение переписывать существующие модули." -#: ../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 "" @@ -9529,10 +9600,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../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 "Согласно информации в модуле, автором является {0}." -#: ../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." @@ -9541,9 +9612,9 @@ "ошибке." -#: ../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 " @@ -9553,13 +9624,13 @@ "модуль." -#: ../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" @@ -9617,4 +9688,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 "неизвестный" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9690,4 +9792,114 @@ msgstr "(Текст уже скопирован в буфер обмена)" +#: ../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 "" +"Невозможно установить соединение с сервером OSM {0}.
Проверьте " +"адрес сервера в настройках и соединение с интернет." + +#: ../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 "" +"Невозможно закрыть набор изменений ''{0}'' на сервере OSM ''{1}''." +"
Набор изменений будет автоматически закрыт сервером по истечении времени " +"ожидания." + +#: ../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 "" +"Ошибка выгрузки данных на сервер, так как ваши " +"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" +"{0}" + +#: ../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 "" +"Невозможно открыть соединение с удаленным сервером
''{0}''
по " +"причинам безопасности. Скорее всего вы запустили
приложение без загрузки " +"формы приложения ''{1}''." + +#: ../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 "" +"Невозможно установить соединение с удаленным сервером
''{0}''." +"
Пожалуйста проверьте свое подключение к интернету." + +#: ../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 "" +"Невозможно загрузить или скачать данные
''{0}''
из-за проблемы " +"передачи данных.
Подробнее: {1}" + +#: ../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 "" +"Сервер OSM
''{0}''
сообщил о внутренней ошибке.
Похоже, это " +"временная проблема. Пожалуйста, попробуйте позднее." + +#: ../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 +#, fuzzy +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 "" +"Максимальная площадь рамки - 0.25. Вы запросили слишком большую область. " +"Уменьшите область, либо воспользуйтесь planet.osm" + +#: ../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 "" +"Невозможно открыть соединение с удаленным сервером
''{0}''.
Имя " +"хоста ''{1}'' не отвечает.
Пожалуйста проверьте адрес API в настройках " +"программы и ваше соединение с интернет." + +#: ../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 "" +"Ошибкапри выгрузке данных, примитив который вы " +"пытаетесь удалить
уже удаленн с сервера.

Сообщение об ошибке:
" +"{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9757,5 +9969,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9764,5 +9976,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9771,5 +9983,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9778,5 +9990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9785,5 +9997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9844,40 +10056,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}" @@ -9885,47 +10096,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 "Загрузка GPX успешно закончена" -#: ../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 "Загрузка GPX трэка: {0}% ({1} из {2})" -#: ../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 "Слой GPX не выбран. Не удается загрузить трэк." -#: ../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 "Загрузка GPX трэка" @@ -10144,5 +10355,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 "Сопоставить изображения с GPX треком" @@ -10156,13 +10367,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 "Необходимо выбрать трек GPX" -#: ../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 "Не выбрано трека GPX" -#: ../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 "" @@ -10173,9 +10384,9 @@ "Ожидаемый формат: {0}" -#: ../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 "" @@ -10186,26 +10397,26 @@ "Ожидаемый формат: {0}" -#: ../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 "Надено {0} совпадений из {1} в GPX трэке {2}" -#: ../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 "Трек GPX загружен" -#: ../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." @@ -10213,39 +10424,39 @@ "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." -#: ../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 "GPX трек не содержит информации о времени" -#: ../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 "Часовой пояс: {0}" -#: ../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 "Минуты: {0}" -#: ../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 "Секунды: {0}" -#: ../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 "Совпавшие {0} из {1} фотографий с GPX треком." -#: ../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 "(Разница во времени {0} дней)" -#: ../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 "Смещение между треком и фотографией: {0}м {1}с" -#: ../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 " @@ -10255,13 +10466,13 @@ "можете вручную сопоставить фотографии использую ползунки." -#: ../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 "Значения по умолчанию" @@ -10299,5 +10510,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 "Ошибка при загрузке файла" @@ -10326,11 +10537,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Город {0} не найден или не сдоступен в WMS.\n" -"Пожалуйста проверьте его доступность на www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10346,13 +10555,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" @@ -10361,13 +10570,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 "" @@ -10488,9 +10697,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 "Добавить \"source=...\" к элементам?" @@ -10600,7 +10809,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "изображение загружается..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10646,7 +10854,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Выбор" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10736,5 +10943,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 "Пустой слой" @@ -11685,18 +11892,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}" @@ -11707,5 +11914,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11715,9 +11922,9 @@ "Настройки карты в окне настроек." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "Настройки osm рендера" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "исполняемый файл Firefox" @@ -11728,28 +11935,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Создать новую точку" + +#: ../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 "Модуль, позволяющий другим приложениям управлять JOSM" -#: ../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 " @@ -11761,29 +11973,37 @@ "приложений, подключающихся к модулю." -#: ../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 "" "модуль дистанционного управления получил запрос на загрузку данных из API." -#: ../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 "Подробности запроса: {0}" -#: ../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 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "" +"модуль дистанционного управления получил запрос на загрузку данных из API." + +#: ../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 "" @@ -12289,25 +12509,33 @@ "Пожалуйста, проверьте не появились ли ошибки." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Введите значения для всех конфликтов." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Решение конфликтов" + #: ../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 "Присоединить районы функционирования" @@ -12388,6 +12616,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 "Ошибки при проверке" @@ -12397,10 +12625,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 "" @@ -12491,51 +12719,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 "Обновление данных" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12561,16 +12803,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) " -"пересекаются на одном слое, но не имеют общей точки." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Создание зданий" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12578,19 +12816,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 -#, fuzzy +#: ../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 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Подтверждение" @@ -12598,19 +12835,16 @@ #: ../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 "Дубликат линии" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Этот тест проверяет, чтобы не было совпадения узлов." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Создать копию линии" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13191,5 +13425,5 @@ msgstr "Достигнут перекрёсток" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Произошла ошибка." @@ -13295,5 +13529,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 " @@ -13303,5 +13537,5 @@ "Пожалуйста попробуйте ещё раз." -#: ../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 "Нет верных WMS URL или ID" @@ -13319,17 +13553,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 "" @@ -13372,19 +13606,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "предусмотрен" - -#: ../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 "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../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 "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13395,14 +13628,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Недопустимая дата" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13411,37 +13643,37 @@ "измените разрешение" -#: ../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 "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../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}" @@ -13449,65 +13681,76 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../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 "WMS" -#: ../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 "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../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 "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../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 "Ссылка на WMS" -#: ../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 "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Копировать умолчания" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Пожалуйста, выберите как минимум одну линию." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Загрузчик" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Накладывающиеся части" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% широты:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% широты:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "Файлы TCX (*.tcx)" +msgstr "" #. * @@ -13918,5 +14161,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 "Сноска" @@ -14458,7 +14701,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Дача/Коттедж" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14479,8 +14721,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 "Прокат" +msgstr "" #. color heath @@ -14498,5 +14739,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 "лес" @@ -14509,7 +14751,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "билеты на парковку" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14545,7 +14786,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "мостовая" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14556,7 +14796,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "неполный" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14567,7 +14806,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "трава" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14761,4 +14999,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" @@ -14787,12 +15026,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 @@ -14840,5 +15079,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14875,5 +15114,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14937,6 +15176,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 "нет" @@ -15082,6 +15322,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 "Тип" @@ -15352,7 +15592,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Пешеходная" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15371,7 +15610,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Шипы" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15663,7 +15901,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 "Оператор" @@ -15876,6 +16114,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 "Возвышение" @@ -16787,7 +17025,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" @@ -16835,23 +17070,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 "Часы работы" @@ -16875,5 +17110,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" @@ -16920,22 +17154,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 "" @@ -16950,22 +17184,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 "" @@ -16980,22 +17214,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 "" @@ -17029,5 +17263,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 "Справочный номер" @@ -17047,7 +17281,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "перехватывающая" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -17061,7 +17294,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Вместимость" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -17071,12 +17303,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Места для инвалидов" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Места для инвалидов" +msgstr "" #: build/trans_presets.java:1400 @@ -17278,5 +17508,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Навес" @@ -17661,7 +17891,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Стоп" +msgstr "" #. color tertiary @@ -17704,28 +17933,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "китайская" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Область для скачивания" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Вставить" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Город (более 100 000)" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "местная" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17753,7 +17977,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Горный туризм" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17767,7 +17990,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "запасный путь" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17784,13 +18006,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Пограничный контороль" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "новичок" +msgstr "" #: build/trans_presets.java:1737 @@ -17807,31 +18027,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "землепользование" +msgstr "растения" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Столб с указателями (туризм)" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Информация" +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 "Ближайшее описание" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Аудио" +msgstr "" #. @@ -17842,5 +18057,4 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" msgstr "Номер телефона" @@ -18166,5 +18380,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18198,5 +18412,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19322,6 +19536,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 "Религия" @@ -19330,66 +19544,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 "Буддизм" -#: 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 "Христианство" -#: 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 "Индуизм" -#: 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 "Иудаизм" -#: 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 "Мусульманство" -#: 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 "сикхизм" -#: 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 "Спиритуализм" -#: 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 "Даосизм" -#: 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 "зороастризм" -#: 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 "Конфессия" @@ -19398,76 +19612,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 "Англиканская" -#: 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 "Баптизм" -#: 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 "Католическая" -#: 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 "Евангельская" -#: 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 "Свидетели Иеговы" -#: 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 "Лютеранство" -#: 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 "Методизм" -#: 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 "Мормон" -#: 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 "Православие" -#: 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 "пятидесятник" -#: 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 "пресвитерианин" -#: 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 "Протестантизм" -#: 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 "квакер" -#: 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 "шиизм" -#: 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 "суннизм" @@ -19799,5 +20013,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 "Примечание" @@ -19822,5 +20036,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 "Монеты" @@ -19828,5 +20042,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 "Банкноты" @@ -19834,5 +20048,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 "Электронные средства оплаты" @@ -19840,5 +20054,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 "Дебитные карты" @@ -19846,5 +20060,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 "Кредитные карты" @@ -19903,10 +20117,144 @@ msgstr "Скамейка" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Назад" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Мемориал" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "ничего" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "место" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Цвет" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Назад" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "вниз" + +#. 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 "зеленый" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "конец" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Значение" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "вода" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Количество кабелей" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Охотничий стенд" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Править охотничий стенд" @@ -19915,30 +20263,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 "Высота" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "низкий" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "средний" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "полный" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Укрытие" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Заблокирован" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Фонтан" @@ -19947,10 +20295,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Править фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Питьевая вода" @@ -19959,10 +20307,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Править источник воды" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Детская комната" @@ -19970,35 +20318,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 "Магазины" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Супермаркет" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Править супермаркет" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Дача/Коттедж" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Редактировать Дача/Коттедж" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Продуктовый магазин" @@ -20006,9 +20352,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Править продуктовый магазин" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Киоск" @@ -20016,29 +20362,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Править киоск" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2493 -#, fuzzy +msgstr "Книжный магазин" + +#. item +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Править автобусную остановку" - -#: build/trans_presets.java:2498 +msgstr "Править книжный магазин" + +#: build/trans_presets.java:2501 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2499 -#, fuzzy +msgstr "Туристическое агенство" + +#. item +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Править дерево" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Торговый автомат" @@ -20046,5 +20390,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Править торговый автомат" @@ -20052,88 +20396,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 "билеты на общественный транспорт" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "план общественного транспорта" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "билеты на парковку" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "еда" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "сладости" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "сигареты" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "еда для животных" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "газеты" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "игрушки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "марки" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-карты" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "телефонные ваучеры" -#: 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 "презервативы" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "тампоны" -#: 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 "Мясная лавка" @@ -20141,9 +20485,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Править мясную лавку" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Булочная" @@ -20151,9 +20495,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Править булочную" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Флорист" @@ -20161,18 +20505,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Редактировать флориста" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Цветочный" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Редактировать Цветочный Магазин" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Алкоголь" @@ -20180,54 +20524,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Редактировать магазин алкогольной продукции" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Напитки" #. 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 "Компьютер" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Редактировать магазин компьютеров" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Электроника" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Редактиновать Магазан электрнонной техники" -#: 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 "Мебельный" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Править мебельный магазин" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Садовый магазин" @@ -20235,9 +20579,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Редактировать Садовый магазин" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Оборудование" @@ -20245,9 +20589,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Редактировать Магазин оборудования" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Строительный магазин" @@ -20255,54 +20599,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 "Канцтовары" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Редактировать Магазин Канцтоваров" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Парикмахерская" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Править парихмахерскую" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Обувь" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Редактировать обувной магазин" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Игрушки" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Редактировать магазин игрушек" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Видео" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Редактировать Магазин видеозаписей" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Химчистка" @@ -20310,9 +20654,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Править химчистку" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Прачечная" @@ -20320,9 +20664,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Править прачечную" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Товары для активного отдыха" @@ -20330,32 +20674,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Править магазин товаров для активного отдыха" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Спорт" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Редактировать Спортивный магазин" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Оптик" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Править оптику" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Наличные" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Банк" @@ -20363,14 +20707,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Править банк" -#: 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 "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Обмен валют" @@ -20378,5 +20722,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Править обмен валют" @@ -20384,15 +20728,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Править банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Здоровье" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Врач" @@ -20400,18 +20744,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Править врача" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Стоматолог" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Править стоматологию" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Аптека" @@ -20419,5 +20763,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Править аптеку" @@ -20425,9 +20769,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Отпуск лекарств по рецептам" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Больница" @@ -20435,10 +20779,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Править больницу" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Пункт вызова экстренной помощи" @@ -20447,5 +20791,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Править пункт вызова экстренной помощи" @@ -20454,20 +20798,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Номер пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Название точки" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Номер телефона" #. 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 "(Используйте международный код, как например +12-345-67890)" @@ -20475,5 +20819,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 "Ветеринар" @@ -20482,55 +20826,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Править ветеринара" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Континент" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Править континент" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Страна" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Править страну" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Штат" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Править штат" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Область" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Править область" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Графство" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Править графство" @@ -20538,15 +20882,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Город (более 100 000)" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Править город" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Город (до 100 000)" @@ -20554,10 +20898,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Править город" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Пригород" @@ -20565,25 +20909,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Править пригород" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Село" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Править село" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Деревня" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Править деревню" @@ -20591,5 +20935,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Местность" @@ -20597,10 +20941,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Править местность" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Остров" @@ -20608,24 +20952,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Править остров" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "влево" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Редактировать Дача/Коттедж" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Вход в пещеру" @@ -20633,10 +20975,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Править вход в пещеру" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Вершина" @@ -20644,10 +20986,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Править вершину" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Ледник" @@ -20655,10 +20997,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Править ледник" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Вулкан" @@ -20666,70 +21008,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Править вулкан" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Границы" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Государственная" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Править государственную границу" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Административная" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Править административную границу" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Гражданская" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Править гражданскую границу" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Политическая" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Править политическую границу" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Национальный парк" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Править национальный парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Землепользование" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Дерево" @@ -20738,15 +21080,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Править дерево" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Научное название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Лесистая местность" @@ -20755,5 +21097,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Править лесистую местность" @@ -20761,17 +21103,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 "Хвойный" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "Лиственный" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "Смешанный" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Лес" @@ -20780,14 +21122,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Править лес" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Заповедник" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Править заповедник" @@ -20795,25 +21137,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Каменистая осыпь" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Редактировать Каменистая осыпь" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Кустарник" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Редактировать Кустарник" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Вырубленный лес" @@ -20821,10 +21163,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Редактировать Вырубленный лес" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Пустошь" @@ -20832,5 +21174,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Редактировать Здоровье" @@ -20838,5 +21180,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Двор фермы" @@ -20845,45 +21187,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Править двор фермы" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Обрабатываемая земля" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Править обрабатываемую землю" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Луг" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Редактировать Луг" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Виноградник" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Править виноградник" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Огороды" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Править огороды" @@ -20891,25 +21233,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Сад" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Править сад" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Трава" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Править траву" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Село" @@ -20917,10 +21259,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Редактировать Село" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Общее" @@ -20928,20 +21270,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Править общее" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Парк" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Править парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Спортплощадка" @@ -20949,5 +21291,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Править спортплощадку" @@ -20955,15 +21297,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Жилая зона" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Править жилую зону" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Церковное кладбище" @@ -20971,9 +21313,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Править церковное кладбище" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Кладбище" @@ -20981,39 +21323,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Править кладбище" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Розничная торговля" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Править розничную торговлю" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Коммерция" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Править коммерцию" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Промышленность" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Править промышленность" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Железная дорога" @@ -21021,15 +21363,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Править ж/д пути" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Военное" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Править военное" @@ -21037,55 +21379,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Стройплощадка" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Править стройплощадку" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Пустырь с развалинами" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Править пустырь с развалинами" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Пустырь" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Править пустырь" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Свалка" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Править свалку" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Карьер" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Править карьер" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Мультиполигональное" @@ -21095,5 +21437,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 "Править мультиполигональное отношение" @@ -21102,10 +21444,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "внешний сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "внутренний сегмент" @@ -21113,5 +21455,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Ограничение на поворот" @@ -21120,5 +21462,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Править ограничение на поворот" @@ -21126,34 +21468,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Ограничение" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "поворот налево запрещён" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "поворот направо запрещён" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "движение прямо запрещено" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "разворот запрещён" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "движение только направо" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "движение только налево" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "движение только прямо" @@ -21162,15 +21504,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "с улицы" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "через точку или линию" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "на улицу" @@ -21178,5 +21520,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Маршрут" @@ -21185,5 +21527,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Править маршрут" @@ -21191,5 +21533,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Тип маршрута" @@ -21197,5 +21539,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21261,5 +21603,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 @@ -21268,17 +21610,17 @@ msgstr "велосипедный" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "автобусный" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "трасса" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "паромный" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "лыжный" @@ -21331,5 +21673,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 @@ -21338,13 +21680,13 @@ msgstr "пеший" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "туристический" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "трамвайный" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "объездной" @@ -21358,10 +21700,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Описание символа" @@ -21369,31 +21711,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Сеть" #. 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 "планируемый" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "альтернативный" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "временный" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "соединяющий" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Цвет (hex)" @@ -21402,30 +21744,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "сегмент маршрута" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "сегмент вперёд" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "конечная точка" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "конечная вперёд" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "конечная назад" @@ -24578,76 +24920,4 @@ msgstr "исторический" -#. 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 "зеленый" - #. color green #. @@ -25615,17 +25885,154 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." +#. 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 "Все линии были пустыми" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Объединить точки из разных отношений?" + +#~ msgid "Merge Anyway" +#~ msgstr "Объединить в любом случае" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." - -#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ "Выделенные точки участвуют в различных отношениях. Всё равно хотите " +#~ "объединить?" + +#~ msgid "Unknown version" +#~ msgstr "Неизвестная версия" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Номер версии отсутствует по данным OSM" + +#~ msgid "Found element in non-way." +#~ msgstr "Найден элемент вне пути." + +#~ msgid " has zero ref" +#~ msgstr "у нет ссылок ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Найден тэг вне отношения." + +#~ msgid "Ill-formed node id" +#~ msgstr "Неверный номер точки" + +#~ msgid "Unknown file extension." +#~ msgstr "Неизвестное расширение файла." + +#~ msgid "Email" +#~ msgstr "Электронная почта" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Соединение с OSM сервером..." + +#~ msgid "Aborting..." +#~ msgstr "Прерывание..." + +#~ msgid "position" +#~ msgstr "положение" + +#~ msgid "different" +#~ msgstr "различный" + +#~ msgid "true" +#~ msgstr "истина" + +#~ msgid "false" +#~ msgstr "ложь" + +#~ msgid "Change" +#~ msgstr "Изменить" + +#~ msgid "unnamed" +#~ msgstr "безымянный" + +#~ msgid "Move" +#~ msgstr "Переместить" + +#~ msgid "Rotate" +#~ msgstr "Вращать" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Разрешить {0} конфликтов в {1} объектах" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Удалить {1} {0}" + +#~ msgid "my version:" +#~ msgstr "моя версия:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} объект имеет конфликты." +#~ msgstr[1] "{0} объекта имеет конфликты." +#~ msgstr[2] "{0} объектов имеет конфликты." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Разрешить конфликты" + +#~ msgid "their version:" +#~ msgstr "их версия:" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Нажмите \"Обновить\" для обновления списка" + +#~ msgid "Date" +#~ msgstr "Дата" + +#~ msgid "Object" +#~ msgstr "Объект" + +#~ msgid "Revert" +#~ msgstr "Откатить" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Тэги (пустое значение удаляет тэг)" + +#~ msgid "Add Selected" +#~ msgstr "Добавить выбранное" + +#~ msgid "Cannot connect to server." +#~ msgstr "Невозможно связаться с сервером." + +#~ msgid "There were conflicts during import." +#~ msgstr "При импортировании возникли конфликтные ситуации." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" + +#~ msgid "Commit comment" +#~ msgstr "Комментарий правки" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." #~ msgstr "" -#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения " -#~ "функции." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " +#~ "повторите попытку позже." + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." #~ msgstr "" -#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " -#~ "Исключение в: {0}" +#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." + +#~ msgid "Occupied By" +#~ msgstr "Объект" #~ msgid "" @@ -25636,189 +26043,4 @@ #~ "создайте отчёт об ошибке." -#~ msgid "No document open so nothing to save." -#~ msgstr "Нет открытых документов. Нечего сохранять." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Удалить {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Удалить участника отношений {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Не удается прочитать каталог с настройками: {0}" - -#~ msgid "nodes" -#~ msgstr "точки" - -#~ msgid "ways" -#~ msgstr "линии" - -#~ msgid "relations" -#~ msgstr "отношения" - -#~ msgid "changesets" -#~ msgstr "наборы изменений" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" - -#~ msgid "Delete Layer" -#~ msgstr "Удалить слой" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Вы действительно хотите удалить слой ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Удалить всё" - -#~ msgid "Authors: {0}" -#~ msgstr "Авторы: {0}" - -#~ msgid "Public" -#~ msgstr "Публичный" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте " -#~ "перед загрузкой." - -#~ msgid "Continue anyway" -#~ msgstr "Продолжить в любом случае" - -#~ msgid "Copy Default" -#~ msgstr "Копия поумолчанию" - -#~ msgid "Edit Information Office" -#~ msgstr "Править справочное бюро" - -#~ msgid "Map Type" -#~ msgstr "Тип карты" - -#~ msgid "map" -#~ msgstr "карта" - -#~ msgid "citymap" -#~ msgstr "карта города" - -#~ msgid "hikingmap" -#~ msgstr "карта туристических маршрутов" - -#~ msgid "bicyclemap" -#~ msgstr "карта велодорожек" - -#~ msgid "Board Type" -#~ msgstr "Тип Инфорационного Щита" - -#~ msgid "board" -#~ msgstr "доска информации" - -#~ msgid "Unknown file extension." -#~ msgstr "Неизвестное расширение файла." - -#~ msgid "Email" -#~ msgstr "Электронная почта" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Соединение с OSM сервером..." - -#~ msgid "Aborting..." -#~ msgstr "Прерывание..." - -#~ msgid "position" -#~ msgstr "положение" - -#~ msgid "different" -#~ msgstr "различный" - -#~ msgid "true" -#~ msgstr "истина" - -#~ msgid "false" -#~ msgstr "ложь" - -#~ msgid "Change" -#~ msgstr "Изменить" - -#~ msgid "unnamed" -#~ msgstr "безымянный" - -#~ msgid "Move" -#~ msgstr "Переместить" - -#~ msgid "Rotate" -#~ msgstr "Вращать" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Разрешить {0} конфликтов в {1} объектах" - -#~ msgid "my version:" -#~ msgstr "моя версия:" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} объект имеет конфликты." -#~ msgstr[1] "{0} объекта имеет конфликты." -#~ msgstr[2] "{0} объектов имеет конфликты." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Разрешить конфликты" - -#~ msgid "their version:" -#~ msgstr "их версия:" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Нажмите \"Обновить\" для обновления списка" - -#~ msgid "Date" -#~ msgstr "Дата" - -#~ msgid "Object" -#~ msgstr "Объект" - -#~ msgid "Revert" -#~ msgstr "Откатить" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Тэги (пустое значение удаляет тэг)" - -#~ msgid "Add Selected" -#~ msgstr "Добавить выбранное" - -#~ msgid "Cannot connect to server." -#~ msgstr "Невозможно связаться с сервером." - -#~ msgid "There were conflicts during import." -#~ msgstr "При импортировании возникли конфликтные ситуации." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" - -#~ msgid "Commit comment" -#~ msgstr "Комментарий правки" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " -#~ "повторите попытку позже." - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." - -#~ msgid "Occupied By" -#~ msgstr "Объект" - #~ msgid "resolved version:" #~ msgstr "Разрешённая версия:" @@ -25849,4 +26071,9 @@ #~ msgstr "Некоторые точки - (почти) на одной линии" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения " +#~ "функции." + #~ msgid "Validate" #~ msgstr "Проверить" @@ -25861,6 +26088,25 @@ #~ msgstr "Подъёмный мост" +#~ msgid "citymap" +#~ msgstr "карта города" + +#~ msgid "hikingmap" +#~ msgstr "карта туристических маршрутов" + +#~ msgid "map" +#~ msgstr "карта" + +#~ msgid "bicyclemap" +#~ msgstr "карта велодорожек" + +#~ msgid "board" +#~ msgstr "доска информации" + #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "подложка Geofabrik.de" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." #~ msgid "Server does not support changesets" @@ -25878,7 +26124,4 @@ #~ msgid "Add all currently selected objects as members" #~ msgstr "Сделать все выбранные объекты участниками отношения" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Удалить текущего участника из отношения" #~ msgid "" @@ -25924,4 +26167,7 @@ #~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" +#~ msgid "No document open so nothing to save." +#~ msgstr "Нет открытых документов. Нечего сохранять." + #~ msgid "Data Layer" #~ msgstr "Слой данных" @@ -25933,11 +26179,4 @@ #~ msgstr "Ошибка при разборе ответа от сервера." -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " -#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." - #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -25946,4 +26185,7 @@ #~ msgstr "Проверить выделенное, либо все загруженные данные" +#~ msgid "Authors: {0}" +#~ msgstr "Авторы: {0}" + #~ msgid "Layers: {0}" #~ msgstr "Слои: {0}" @@ -25951,4 +26193,7 @@ #~ msgid "Conflicts: {0}" #~ msgstr "Конфликты: {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Не удается прочитать каталог с настройками: {0}" #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -25982,6 +26227,6 @@ #~ msgstr "Импортировать файл TCX..." -#~ msgid "end" -#~ msgstr "конец" +#~ msgid "Public" +#~ msgstr "Публичный" #~ msgid "" @@ -26003,4 +26248,7 @@ #~ msgid "Basic" #~ msgstr "Основной" + +#~ msgid "Delete Layer" +#~ msgstr "Удалить слой" #~ msgid "Relation Editor: {0}" @@ -26059,4 +26307,7 @@ #~ "или вашем языке." +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" + #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -26075,4 +26326,7 @@ #~ msgstr "Выберите Таблицу d'Assemblage" +#~ msgid "Edit Information Office" +#~ msgstr "Править справочное бюро" + #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" @@ -26082,4 +26336,12 @@ #~ msgid "Remove route nodes" #~ msgstr "Удалить узлы маршрутизации" + +#~ msgid "Continue anyway" +#~ msgstr "Продолжить в любом случае" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте " +#~ "перед загрузкой." #~ msgid "No intersections found. Nothing was changed." @@ -26141,4 +26403,7 @@ #~ msgstr "выпрямитель id={0}" +#~ msgid "Copy Default" +#~ msgstr "Копия поумолчанию" + #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " @@ -26153,4 +26418,10 @@ #~ msgstr "Прямо загрузить TCX файлы из JOSM." +#~ msgid "Map Type" +#~ msgstr "Тип карты" + +#~ msgid "Board Type" +#~ msgstr "Тип Инфорационного Щита" + #~ msgid "Charge" #~ msgstr "Переодевание" @@ -26173,7 +26444,4 @@ #~ msgid "Cannot read numeric value from response" #~ msgstr "Не возможно прочесть числовое знаечение из ответа" - -#~ msgid "Overlap tiles" -#~ msgstr "Накладывающиеся части" #~ msgid "" @@ -26192,7 +26460,4 @@ #~ "Не делайте выгрузку данных после данного сообщения." -#~ msgid "% of lat:" -#~ msgstr "% широты:" - #~ msgid "% of lon:" #~ msgstr "% долготы:" @@ -26249,4 +26514,10 @@ #~ msgstr "Удалить мои" +#~ msgid "nodes" +#~ msgstr "точки" + +#~ msgid "relations" +#~ msgstr "отношения" + #~ msgid "API initialization failed" #~ msgstr "Сбой инициализации API" @@ -26255,7 +26526,18 @@ #~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." +#~ msgid "changesets" +#~ msgstr "наборы изменений" + +#~ msgid "ways" +#~ msgstr "линии" + #~ msgid "Apply partial resolutions" #~ msgstr "Применить частичное решение" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" + #~ msgid "Adjust the position of the WMS layer (raster images only)" #~ msgstr "Подогнать позицию WMS слоя (только растровые изображения)" @@ -26270,4 +26552,18 @@ #~ msgstr "Слой{0} должен быть в списке слоев" +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Удалить участника отношений {0} {1}" + #~ msgid "Conflict created" #~ msgstr "Конфликт создан" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Вы действительно хотите удалить слой ''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Удалить всё" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " +#~ "Исключение в: {0}" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 17594) +++ /applications/editors/josm/i18n/po/sk.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-09-05 04:48+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-12 05:45+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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 "Pomocník" -#: ../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 "Projekcia {0} nemohla byť aktivovaná. Používam Mercator" -#: ../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,55 +103,55 @@ #: ../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 "Chyba" -#: ../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] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" -msgstr[1] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" -msgstr[2] "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"Vo vrstve sa nachádzajú neuložené {0} zmeny. Nepoužiť zmeny a pokračovať?" +msgstr[1] "" +"Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?" +msgstr[2] "" +"Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a pokračovať?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Neuložené zmeny" -#: ../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 "Uložiť a Ukončiť" -#: ../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 "Zrušiť a Ukončiť" -#: ../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 @@ -158,11 +160,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 @@ -176,20 +179,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 "Zrušiť" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem skomolenú URL: \"{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 @@ -206,16 +209,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 @@ -245,15 +248,17 @@ msgstr "Varovanie" -#: ../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 "Ignorujem poškodený súbor z URL: \"{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 -#, fuzzy, java-format +#: ../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}" -msgstr "Nemôžem čítať súbor ''{0}''. Chyba je:
{1}" +msgstr "Nemôžem čítať súbor ''{0}''.
Chyba je:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -340,5 +345,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 "Pluginy" @@ -353,22 +358,21 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na stránku " -"histórie pre OSM pôvodné budú pravdepodobne chybné. API základňa URL je: " -"''{0}''" +"VAROVANIE: neočakávaný formát z API bázy URL. Presmerovávanie na info, alebo " +"stránku priebehu pre OSM pôvodné vedú pravdepodobne ku chybe. API báza URL " +"je: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na stránku " -"histórie pre OSM pôvodné budú pravdepodobne chybné. API základňa URL je: " -"''{0}''" +"VAROVANIE: neočakávaný formát z API báze URL. Presmerovávanie na stránku " +"užívateľa pre OSM užívateľ je pravdepodobne chybný. API báza URL je: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -479,9 +483,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 @@ -515,6 +519,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 @@ -533,11 +537,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 "Informácia" @@ -559,5 +563,5 @@ msgstr "Vyberte prosím aspoň 3 body." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -568,10 +572,10 @@ "{0}, maximálne je {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 Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -582,5 +586,5 @@ "pôvodných {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -591,9 +595,9 @@ "dĺžku {2}. Dĺžka hodnôt je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Predpoklad Porušenia" -#: ../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}" @@ -648,26 +652,22 @@ msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť" -#: ../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 "Spojiť cesty" -#: ../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 "Spojiť niekoľko ciet do jednej." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." - -#: ../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 "Spojiť cesty patriace do rôznych vzťahov (relátion)?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Aj tak spojiť" -#: ../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 " @@ -676,13 +676,13 @@ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Zmeniť smer?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Otočiť a Spojiť" -#: ../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 " @@ -692,30 +692,18 @@ "ciest?" -#: ../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 "Zadajte hodnoty pre všetky konflikty" - -#: ../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 "Riešenie konfliktov" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Spojiť {0} ciest" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Všetky cesty boli prázdne" - -#: ../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 "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Spojiť {0} ciest" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -771,5 +759,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 "Odstrániť" @@ -779,15 +767,15 @@ msgstr "Zmazať zvolené objekty." -#: ../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 "Prepísať" -#: ../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 "Súbor už existuje. Prepísať?" @@ -816,10 +804,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}" @@ -850,5 +838,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 @@ -891,7 +879,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Všetky obrázky" +msgstr "Všetky formáty" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1029,1085 +1016,25 @@ msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy" -#: ../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 "Zlúčiť body" -#: ../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 "Zlúčiť body do najstaršieho bodu" -#: ../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 "Zvoľte minimálne dva body pre zlúčenie" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Zlúčiť body s rôznymi členmi ?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Aj tak zlúčiť" - -#: ../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 "" -"Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich " -"chcete zlúčiť ?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Zlúčiť {0} body" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Zlúčiť výber" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy" - -#: ../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 "Zrkadlo" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Zrkadlovo vybrané body a cesty." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Prosím vyberte aspoň jeden bod, alebo cestu." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "hore" - -#: ../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 "Presunúť objekty {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "dole" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "vľavo" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "vpravo" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Presunúť {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Presunutie objektov {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 "Nemôžem presúvať objekty mimo svet." - -#: ../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 "Nový" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Vytvoriť novú mapu" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Otvoriť..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Otvoriť súbor." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Otvoriť súbor." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Neznáma funkcia ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Otvoriť umiestnenie..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Otvoriť z URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Oddeliť vrstvu" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Vložte URL pre sťahovanie:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Priečinok sťahovania" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Sťahovacia URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Pravouhlý tvar" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Povolené iba dva body" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Výber sa musí skladať iba z ciest" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." - -#: ../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 "" -"Používate EPSG:4326 projekciu ktorá môže viesť
k nežiadúcim " -"výsledkom keď vytvárate pravouhlé zarovnanie.
Zmeňte vaše zobrazenie ak " -"chcete odstrániť toto upozornenie.
Chcete pokračovať?" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Vybratý iba jeden bod" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Pravouhlosť" - -#: ../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 "Vložiť" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Vložiť zo schránky" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Vložiť vlastnosti" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Použiť značky objektov v schránke na všetky zvolené objekty." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Nahrávam {0}" -msgstr[1] "Nahrávam {0}" -msgstr[2] "Nahrávam {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Obnoviť {0} pôvodných" -msgstr[1] "Obnoviť {0} pôvodných" -msgstr[2] "Obnoviť {0} pôvodných" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Nastavenia..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Otvoriť globálne nastavenie" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Nastavenia" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Opakovať" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Zopakuje poslednú zrušenú akciu." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Premenovať vrstvu" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Tiež premenovať súbor" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "Nemôžem premenovať súbor ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Otočiť smer ciest" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Otočiť smer všetkých zvolených ciest." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Zvoľte minimálne jednu cestu." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Otočiť smer ciest" - -#: ../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 "Uložiť" - -#: ../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 "Uložiť aktuálne dáta." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Súbor {0} existuje. Prepísať ho?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "Žiadny exportér nenájdený! Nič zachránené.." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Prázdny dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokument neobsahuje dáta." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Uložiť akokoľvek" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikty" - -#: ../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 "" -"Sú tu stále nevyriešené konflikty. Konflikty nebudú uložené a budú " -"vyriešené, ako by boli všetky odmietnuté. Pokračovať?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Zamietnuť konflikty a Uložiť" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Uložiť OSM súbor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Uložiť GPX súbor" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Uložiť vrstvu" - -#: ../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 "Uložiť ako..." - -#: ../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 "Uložiť aktuálne údaje do nového súboru." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Vybrať všetko" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Vybraté všetky obnovené objekty v údajovej vrstve. Tento výber obsahuje aj " -"neúplné objekty." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Zobraziť správu o stave" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku " -"chybám" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Pomoc: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Správa o stave" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopírovať do schránky a zavrieť" - -#: ../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 "Zavrieť" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Rozdeliť cestu" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Rozdeliť cestu vo zvolenom bode" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Tento výber nemôže byť použitý k rozdeleniu." - -#: ../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] "Vybratý bod nie je v strede cesty." -msgstr[1] "Vybraté body nie sú v strede cesty." -msgstr[2] "Vybraté body nie sú v strede cesty." - -#: ../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] "" -"Je tam viac ako jedna cesta používajúca bod, ktorý ste vybrali. Prosím " -"vyberte tiež cestu." -msgstr[1] "" -"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " -"vyberte tiež cestu." -msgstr[2] "" -"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " -"vyberte tiež cestu." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Zvolené body nezdieľajú rovnakú cestu." - -#: ../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] "Označená cesta neobsahuje vybratý bod." -msgstr[1] "Označená cesta neobsahuje všetky vybraté body." -msgstr[2] "Označená cesta neobsahuje všetky vybraté body." - -#: ../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 "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty." - -#: ../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 "" -"Cesta nemôže byť rozdelená vo zvolených bodoch. (Tip: Zvoľte body uprostred " -"cesty.)" - -#: ../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 "" -"Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých " -"nových ciest.
Mali by ste toto potvrdiť a opraviť to ak je to potrebné." - -#: ../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 "" -"Vzťah relácie bol skopírovaný do všetkých nových ciest.
Mali by ste " -"toto overiť a opraviť ak je to nutné." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 -#, java-format -msgid "Split way {0} into {1} parts" -msgstr "Rozdeliť cestu {0} do {1} častí" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Zatváranie kontroly..." - -#: ../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 "Zatváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -#, fuzzy -msgid "There is currently no changeset open." -msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Zatváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Zapnúť GPX čiary" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Kresliť spojnice medzi GPS bodmi" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Zapnúť/Vypnúť globálne nastavenie ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Rozpojiť cesty" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Zduplikovať body používané viacerými cestami." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Tento bod nie je prilepený k ničomu inému." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Tento výber sa nedá použiť pre oddelenie bodov" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Vyberte buď:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Jeden označený bod, alebo" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Jeden bod používaný viac než jednou cestou, alebo" - -#: ../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 "" -"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" - -#: ../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 "" -"* Jednu cestu s jedným, alebo viac bodov používanými vo viac než jednej " -"ceste, alebo" - -#: ../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 "" -"* Jednu cestu a jeden alebo viac jej bodov používaných vo viac než jednej " -"ceste." - -#: ../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 "" -"Poznámka: Ak je vybratá cesta, dostane čerstvé kópie odlepených\n" -"bodov a tieto nové body budú vybraté. Inak všetky cesty dostanú\n" -"svoje vlastné kópie a všetky bodybudú vybraté." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Nepripojený bod (Unglued Node)" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplikovať do {0} bodov" - -#. 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 "Duplikovať body {0} do {1} bodov" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Späť" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Vrátiť poslednú akciu." - -#: ../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 "Odznačiť všetko" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Odznačiť všetky objekty" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Odznačiť všetko (Focus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Odznačiť všetko (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Aktualizovať údaje" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)" - -#. 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 "Aktualizujem dáta" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "Nájdená neaktuálna dátová sada" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "Neviem zistiť pôvodné s id {0} v aktuálnej dátovej sade" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Aktualizácia výberu" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Aktualizovať práve vybrané pôvodné zo servera" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Výber je prázdny" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Uložiť do OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Uložiť všetky zmeny na OSM server." - -#: ../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 "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Žiadne zmeny pre uloženie." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synchronizovať {0} {1} iba" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Synchronizovať celú dátovú sadu" - -#: ../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 "" -"Aktualizácia neúspešná pretože server ná novú verziu " -"jednu z
vaších bodov, ciest, alebo relácií.
Konflikt je zapríčinený " -"{0} s id {1},
server má verziu {2}," -"vaša verzia je {3}.

Click {4} pre synchronizáciu iba " -"sporných pôvodných.
Click {5} pre synchronizáciu celej " -"lokálnej dátovej sady so serverom.
Click {6} pre " -"zrušenie a pokračovanie v editácii.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Zistený 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 "neočakávaná hodnota. Dostal {0}" - -#: ../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 "" -"Nahrávanie neúspešné pretože server má novú verziu " -"jednu z
vašich bodov,ciest, alebo relácií.

Click {0}pre synchronizáciu celej lokálnej dátovej sady so serverom.
Click " -"{1} pre zrušenie a pokračovanie v editácii.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Varovanie: chybné záhlavie \"{0}\" nie je zhoda s očakávanou schémou \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "Upload zlyhal.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Nahrávanie na OSM API neúspešné" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Aktualizácia pôvodných" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Uložiť tieto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Nahrať zmeny" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, fuzzy, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Upraviť novú reláciu vo vrstve \"{0}\"" - -#: ../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 "Pridať nový bod do existujúcej cesty" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "nahrať všetky zmeny v jednej požiadavke" - -#: ../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 "" -"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej " -"požiadavky na zmenené pôvodné" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Doplniť krátky komentár k nahrávaným zmenám" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Nastavenie mapy" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "changeset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Pridané objekty:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Upravené objekty:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Odstránené objekty:" - -#: ../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] "Pridané objekty:" -msgstr[1] "Pridané objekty:" -msgstr[2] "Pridané objekty:" - -#: ../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] "Upravené objekty:" -msgstr[1] "Upravené objekty:" -msgstr[2] "Upravené objekty:" - -#: ../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] "Odstránené objekty:" -msgstr[1] "Odstránené objekty:" -msgstr[2] "Odstránené objekty:" - -#: ../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 "Posledná zmena {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Priblížiť" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Oddialiť" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Späť" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Skok späť" - -#: ../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 "Rýchlejšie" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Rýchle prehrávanie" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Vpred" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Skok vpred" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Ďalšia značka" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Prehrajte nasledujúcu značku" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Prehrať/Pauza" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Prehrať/Pauza audio" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Predchádzajúca značka" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Prehrajte predchádzajúcu značku" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Pomalšie" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Spomalené prehrávanie" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Sťahujem GPS dáta" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Stiahnuté GPX dáta" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Nekomprimované (Raw) GPS dáta" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Sťahujem dáta" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "Neboli importované žiadne dáta." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "údaje OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Stiahnuté {0} z {1} ({2} ostáva(left))" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Chyby v priebehu sťahovania" - -#: ../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 "" -"Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré
ktoré by " -"mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, " -"alebo
aktualizovať ich server pravdepodobne ohlási
konflikt." -"

Click {1}kontrola stavutýchto pôvodných
na " -"servery.
Click {2}ignorovať.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Vymazané alebo presunuté pôvodné" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Režim mazania" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Zmazať body alebo cesty" - -#: ../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žim: {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 "" -"Kľuknite pre zmazanie. Shift: zmaže segment cesty. Alt: zmaže cestu, ale " -"nemaže body. CTRL: zmaže referenčné objekty." - +#: ../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 @@ -2118,7 +1045,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 @@ -2127,6 +1055,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 @@ -2157,4 +1085,924 @@ msgstr "parameter ''{0}'' nesmie byť nulový" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Zlúčiť {0} body" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Zlúčiť výber" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy" + +#: ../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 "Zrkadlo" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Zrkadlovo vybrané body a cesty." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Prosím vyberte aspoň jeden bod, alebo cestu." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "hore" + +#: ../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 "Presunúť objekty {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "dole" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "vľavo" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "vpravo" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Presunúť {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Presunutie objektov {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 "Nemôžem presúvať objekty mimo svet." + +#: ../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 "Nový" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Vytvoriť novú mapu" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Otvoriť..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Otvoriť súbor." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Otváranie súborov" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Otváranie súboru ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Otvoriť umiestnenie..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Otvoriť z URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Oddeliť vrstvu" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Vložte URL pre sťahovanie:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Priečinok sťahovania" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Sťahovacia URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Pravouhlý tvar" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Povolené iba dva body" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Výber sa musí skladať iba z ciest" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." + +#: ../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 "" +"Používate EPSG:4326 projekciu ktorá môže viesť
k nežiadúcim " +"výsledkom keď vytvárate pravouhlé zarovnanie.
Zmeňte vaše zobrazenie ak " +"chcete odstrániť toto upozornenie.
Chcete pokračovať?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Vybratý iba jeden bod" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Pravouhlosť" + +#: ../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 "Vložiť" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Vložiť zo schránky" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Vložiť vlastnosti" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Použiť značky objektov v schránke na všetky zvolené objekty." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Vkladanie {0} značiek" +msgstr[1] "Vkladanie {0} značky" +msgstr[2] "Vkladanie {0} značiek" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "až {0} pôvodné" +msgstr[1] "až {0} pôvodný" +msgstr[2] "až {0} pôvodných" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Nastavenia..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Otvoriť globálne nastavenie" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Nastavenia" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Opakovať" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Zopakuje poslednú zrušenú akciu." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Premenovať vrstvu" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Tiež premenovať súbor" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Nemôžem premenovať súbor ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Otočiť smer ciest" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Otočiť smer všetkých zvolených ciest." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Zvoľte minimálne jednu cestu." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Otočiť smer ciest" + +#: ../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 "Uložiť" + +#: ../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 "Uložiť aktuálne dáta." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Súbor {0} existuje. Prepísať ho?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Žiadny exportér nenájdený! Nič zachránené.." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Prázdny dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Uložiť akokoľvek" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokument neobsahuje dáta." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Zamietnuť konflikty a Uložiť" + +#: ../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 "" +"Sú tu stále nevyriešené konflikty. Konflikty nebudú uložené a budú " +"vyriešené, ako by boli všetky odmietnuté. Pokračovať?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Uložiť OSM súbor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Uložiť GPX súbor" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Uložiť vrstvu" + +#: ../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 "Uložiť ako..." + +#: ../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 "Uložiť aktuálne údaje do nového súboru." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Vybrať všetko" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Vybraté všetky obnovené objekty v údajovej vrstve. Tento výber obsahuje aj " +"neúplné objekty." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Zobraziť správu o stave" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku " +"chybám" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Pomoc: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Správa o stave" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopírovať do schránky a zavrieť" + +#: ../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 "Zavrieť" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Rozdeliť cestu" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Rozdeliť cestu vo zvolenom bode" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Tento výber nemôže byť použitý k rozdeleniu." + +#: ../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] "Vybratý bod nie je v strede cesty." +msgstr[1] "Vybraté body nie sú v strede cesty." +msgstr[2] "Vybraté body nie sú v strede cesty." + +#: ../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] "" +"Je tam viac ako jedna cesta používajúca bod, ktorý ste vybrali. Prosím " +"vyberte tiež cestu." +msgstr[1] "" +"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " +"vyberte tiež cestu." +msgstr[2] "" +"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím " +"vyberte tiež cestu." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Zvolené body nezdieľajú rovnakú cestu." + +#: ../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] "Označená cesta neobsahuje vybratý bod." +msgstr[1] "Označená cesta neobsahuje všetky vybraté body." +msgstr[2] "Označená cesta neobsahuje všetky vybraté body." + +#: ../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 "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty." + +#: ../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 "" +"Cesta nemôže byť rozdelená vo zvolených bodoch. (Tip: Zvoľte body uprostred " +"cesty.)" + +#: ../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 "" +"Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých " +"nových ciest.
Mali by ste toto potvrdiť a opraviť to ak je to potrebné." + +#: ../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 "" +"Vzťah relácie bol skopírovaný do všetkých nových ciest.
Mali by ste " +"toto overiť a opraviť ak je to nutné." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Rozdeliť cestu {0} do {1} častí" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "Zavrieť aktuálny súbor zmien" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "Zatváram aktuálny súbor zmien ..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "Teraz tam nie je otvorený súbor zmien." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "Neotvárajte súbor zmien" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "Zatváranie súboru zmien" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Zapnúť GPX čiary" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Kresliť spojnice medzi GPS bodmi" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Zapnúť/Vypnúť globálne nastavenie ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Rozpojiť cesty" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Zduplikovať body používané viacerými cestami." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Tento bod nie je prilepený k ničomu inému." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Tento výber sa nedá použiť pre oddelenie bodov" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Vyberte buď:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Jeden označený bod, alebo" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Jeden bod používaný viac než jednou cestou, alebo" + +#: ../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 "" +"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" + +#: ../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 "" +"* Jednu cestu s jedným, alebo viac bodov používanými vo viac než jednej " +"ceste, alebo" + +#: ../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 "" +"* Jednu cestu a jeden alebo viac jej bodov používaných vo viac než jednej " +"ceste." + +#: ../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 "" +"Poznámka: Ak je vybratá cesta, dostane čerstvé kópie odlepených\n" +"bodov a tieto nové body budú vybraté. Inak všetky cesty dostanú\n" +"svoje vlastné kópie a všetky bodybudú vybraté." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Nepripojený bod (Unglued Node)" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplikovať do {0} bodov" + +#. 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 "Duplikovať body {0} do {1} bodov" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Späť" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Vrátiť poslednú akciu." + +#: ../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 "Odznačiť všetko" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Odznačiť všetky objekty" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Odznačiť všetko (Focus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Odznačiť všetko (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Aktualizovať údaje" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)" + +#. 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 "Aktualizujem dáta" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "Nájdená neaktuálna dátová sada" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Neviem zistiť pôvodné s id {0} v aktuálnej dátovej sade" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Aktualizácia výberu" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Aktualizovať práve vybrané pôvodné zo servera" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Výber je prázdny" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Uložiť do OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Uložiť všetky zmeny na OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Sú nevyriešené konflikty vo vrstve ''{0}''.
Najskôr ich vyriešte." +"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Žiadne zmeny pre uloženie." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synchronizovať {0} {1} iba" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Synchronizovať celú dátovú sadu" + +#: ../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 "" +"Aktualizácia neúspešná pretože server ná novú verziu " +"jednu z
vaších bodov, ciest, alebo relácií.
Konflikt je zapríčinený " +"{0} s id {1},
server má verziu {2}," +"vaša verzia je {3}.

Click {4} pre synchronizáciu iba " +"sporných pôvodných.
Click {5} pre synchronizáciu celej " +"lokálnej dátovej sady so serverom.
Click {6} pre " +"zrušenie a pokračovanie v editácii.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Zistený 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 "neočakávaná hodnota. Dostal {0}" + +#: ../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 "" +"Nahrávanie neúspešné pretože server má novú verziu " +"jednu z
vašich bodov,ciest, alebo relácií.

Click {0}pre synchronizáciu celej lokálnej dátovej sady so serverom.
Click " +"{1} pre zrušenie a pokračovanie v editácii.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Varovanie: chybné záhlavie \"{0}\" nie je zhoda s očakávanou schémou \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Upload zlyhal.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Nahrávanie na OSM API neúspešné" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Aktualizácia pôvodných" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Náhrávanie dát do vrstvy ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Priblížiť" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Oddialiť" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Späť" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Skok späť" + +#: ../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 "Rýchlejšie" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Rýchle prehrávanie" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Vpred" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Skok vpred" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Ďalšia značka" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Prehrajte nasledujúcu značku" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Prehrať/Pauza" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Prehrať/Pauza audio" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Predchádzajúca značka" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Prehrajte predchádzajúcu značku" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Pomalšie" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Spomalené prehrávanie" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Sťahujem GPS dáta" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Stiahnuté GPX dáta" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Nekomprimované (Raw) GPS dáta" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Sťahujem dáta" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Neboli importované žiadne dáta." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "údaje OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Stiahnuté {0} z {1} ({2} ostáva(left))" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Chyby v priebehu sťahovania" + +#: ../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 "" +"Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré
ktoré by " +"mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, " +"alebo
aktualizovať ich server pravdepodobne ohlási
konflikt." +"

Click {1}kontrola stavutýchto pôvodných
na " +"servery.
Click {2}ignorovať.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Vymazané alebo presunuté pôvodné" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Režim mazania" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Zmazať body alebo cesty" + +#: ../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žim: {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 "" +"Kľuknite pre zmazanie. Shift: zmaže segment cesty. Alt: zmaže cestu, ale " +"nemaže body. CTRL: zmaže referenčné objekty." + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2271,18 +2119,18 @@ "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode." -#: ../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 "Výber" -#: ../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 "Zvoliť, posunúť a otáčať objekty" -#: ../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" @@ -2292,18 +2140,18 @@ msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Posunúť elementy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Posunúť ich(them)" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Krok späť posun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2311,11 +2159,10 @@ "Really move them?" msgstr "" -"Presunuli ste viac ako {0} objektov. Presun veľkého množstva objektov je " -"často chyba.\n" -"Skutočne ich presunúť?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +"Presúvate viac ako {0} prvok. Presúvanie viacerých prvkov je často chyba.\n" +"Skutočne ich chcete presunúť?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Vždy posúvať a nezobrazovať znovu dialóg" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2439,7 +2286,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objekt s pridaným ID" +msgstr "id:... - objekt s určeným ID (0 pre nové objekty)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2491,41 +2337,41 @@ msgstr "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../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 "Neboli nájdené záznamy pre \"{0}\"" -#: ../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 "Nič nebolo pridané do výberu hľadaním \"{0}\"" -#: ../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 "Nič nebolo odstránené z výberu hľadaním \"{0}\"" -#: ../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 "Najdených {0} zodpovedajúcich výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2538,5 +2384,5 @@ "{2}" -#: ../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 "" @@ -2544,10 +2390,10 @@ "použitia: kľúč=hodnota" -#: ../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 "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!" -#: ../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" @@ -2555,26 +2401,26 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../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 "Neočakávaná značka: {0}" -#: ../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 "Chýbajúci argument pre \"alebo\"" -#: ../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 "Chýbajúci argument pre \"NOT\"" -#: ../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 "Očakávam uzatváraciu zátvorku." -#: ../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 "Zlé číslo parametrov pre operátor bodov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2585,5 +2431,5 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../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." @@ -2620,62 +2466,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Pridať bod" +msgstr "Pridať bod {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Pridať {0} {1}" +msgstr "Pridať cestu {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relácie: {0}" +msgstr "Pridať reláciu {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Zmenová sada {0}" +msgstr "Zmeniť bod {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Zmenová sada {0}" +msgstr "Zmeniť cestu {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Zmeniť reláciu" +msgstr "Zmeniť reláciu {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Odstranené \"{0}\" pre {1} ''{2}''" +msgstr "Presunúť \"{0}\" pre bod ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Odstranené \"{0}\" pre {1} ''{2}''" +msgstr "Presunúť \"{0}\" pre cestu ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Odstranené \"{0}\" pre {1} ''{2}''" +msgstr "Remove \"{0}\" for reláciu ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Nastavené {0}={1} pre {2} ''{3}''" +msgstr "Nastavenie {0}={1} pre bod ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Nastavené {0}={1} pre {2} ''{3}''" +msgstr "Nastavenie {0}={1} pre cestu ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Nastavené {0}={1} pre {2} ''{3}''" +msgstr "Nastavenie {0}={1} pre reláciu ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2750,34 +2596,34 @@ #: ../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] "Zmazať {0} {1}" -msgstr[1] "Zmazať {0} {1}" -msgstr[2] "Zmazať {0} {1}" +msgstr[0] "Zmazať {0} objekty" +msgstr[1] "Zmazať {0} objekt" +msgstr[2] "Zmazať {0} objektov" #: ../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] "Režim mazania" -msgstr[1] "Režim mazania" -msgstr[2] "Režim mazania" +msgstr[0] "Zmazať {0} body" +msgstr[1] "Zmazať {0} bod" +msgstr[2] "Zmazať {0} bodov" #: ../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] "Zmazať {0} {1}" -msgstr[1] "Zmazať {0} {1}" -msgstr[2] "Zmazať {0} {1}" +msgstr[0] "Zmazať {0} cesty" +msgstr[1] "Zmazať {0} cestu" +msgstr[2] "Zmazať {0} ciest" #: ../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] "Zmazať z relácie (zo vzťahu" -msgstr[1] "Zmazať z relácie (zo vzťahu" -msgstr[2] "Zmazať z relácie (zo vzťahu" +msgstr[0] "Zmazať {0} relácie" +msgstr[1] "Zmazať {0} reláciu" +msgstr[2] "Zmazať {0} relácií" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2791,20 +2637,19 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\" s funkciou {2}.\n" -"Zmazať zo vzťahu (relation)?" +"Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.
Zmazať z " +"relácie?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\".\n" -"Zmazať zo vzťahu (relation)?" +"Výber \"{0}\" je použitý reláciou \"{1}\".
Zmazať z relácie?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2815,5 +2660,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." @@ -2873,15 +2718,15 @@ #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Odobrať bod ''{0}'' v mieste {1} z relácie ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Odobrať cestu ''{0}'' v mieste {1} z relácie ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Odobrať reláciu ''{0}'' v mieste {1} z relácie ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2898,17 +2743,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" +msgstr "Vyriešiť {0} konfliktné značky v bode {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" +msgstr "Vyriešiť {0} konfliktné značky v ceste {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" +msgstr "Vyriešiť {0} konfliktné značky v relácii {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2918,17 +2763,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Vyriešte konflikt verzií pre {0} {1}" +msgstr "Vyriešiť konflikty verzie pre bod {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Vyriešte konflikt verzií pre {0} {1}" +msgstr "Vyriešiť konflikty verzie pre cestu {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Vyriešte konflikt verzií pre {0} {1}" +msgstr "Vyriešiť konflikty verzie pre reláciu {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3010,5 +2855,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 @@ -3018,9 +2863,11 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." -msgstr "failed to set reference. reference id {0} doesn't match history id {1}" +msgstr "" +"VAROVANIE: Neúspešná inicializácia preferencií. Adresár preferencií ''{0}'' " +"nie je adresár." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3030,4 +2877,6 @@ "isn't a directory." msgstr "" +"Neúspešná inicializácia preferencií.
Adresár preferencií ''{0}'' " +"nie je adresár." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 @@ -3037,4 +2886,6 @@ "preference directory: {0}" msgstr "" +"VAROVANIE: Neúspešná inicializácia preferencií. Neúspešné vytváranie " +"chýbajúceho adresára preferencií: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 @@ -3044,4 +2895,6 @@ "preference directory: {0}" msgstr "" +"Neúspešná inicializácia preferencií.
Neúspešné vytváranie " +"chýbajúceho adresára preferencií: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 @@ -3050,4 +2903,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"VAROVANIE: Chýbajúci adresár preferencií ''{0}''. Vytváranie východzieho " +"súboru preferencií." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -3057,4 +2912,6 @@ "file." msgstr "" +"VAROVANIE: Nahrádzanie existujúceho súboru preferencií ''{0}'' s východzím " +"súborom preferencií." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 @@ -3064,11 +2921,15 @@ "to default: {0}" msgstr "" +"Neúspešná inicializácia preferencií.
Chyba pri resetovaní súboru " +"preferencií do východzieho: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}." +msgstr "" +"Súbor preferencií mal chyby.
Vytváranie zo zálohy staršieho " +"súboru
{0}
a vytváranie nového východzieho súboru." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3078,4 +2939,6 @@ "default: {0}" msgstr "" +"Varovanie: Neúspešná inicializácia preferencií. Neúspešné resetovanie " +"preferencií do východzích: {0}" #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 @@ -3137,28 +3000,53 @@ msgstr "V" -#: ../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 msgid "Changeset {0}" -msgstr "Zmenová sada {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 +msgstr "Súbor zmien {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323 #, java-format msgid "parameter {0} > 0 required. Got {1}." msgstr "parameter {0} > 0 požadovaný. Dostal {1}." -#: ../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 "parameter ''{0}'' nesmie byť nulový" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../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 "Varovanie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "neočakávaný index stĺpca. Got {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257 msgid "a primitive with id=0 can't be invisible" -msgstr "" +msgstr "pôvodné s id=0 nemôžu byť neviditeľné" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "id > 0 očakávaný, got {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "id > 0 očakávaný, got {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3172,11 +3060,18 @@ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''" -#: ../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 "" +"kolekcia značiek nemôže byť použitápre pôvodné pretože sú tam kľúče s " +"viacnásobnými hodnotami" + +#: ../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 "" @@ -3227,9 +3122,9 @@ msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" -#: ../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 "Cesta označená ako plocha nie je uzavretá." -#: ../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." @@ -3238,118 +3133,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 "Prázdny člen vo vzťahu (relation)." -#: ../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 "Vymazaný člen ''{0}'' vo vzťahu (relation)." -#: ../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 "Cesta ''{0}'' s menej, než dvoma bodmi." -#: ../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 "Najdená viac než jedna \"from\" cesta." -#: ../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 "Najdené viac cieľových \"to\" ciest." -#: ../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 "Viac ako jedna \"via\" najdená." -#: ../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 "Neznáma funkcia ''{0}''." -#: ../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 "Neznámy typ člena pre ''{0}''." -#: ../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 "Nenajdená cesta \"from\"." -#: ../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 "Nenajdená cesta \"to\"." -#: ../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 "Nie je \"via\" bod alebo cesta najdená." -#: ../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 "Cesta \"from\" nezačína, ani nekončí v bode \"via\"." -#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." -#: ../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 "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." -#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." -#: ../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 "Štýl pre obmedzenie {0} nenajdený." -#: ../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 "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." -#: ../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 "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." -#: ../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 "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." -#: ../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 "Cesty ''{0}'' a ''{1}'' se pretínajú." -#: ../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 "Vnútorná(inner) cesta ''{0}'' je vonku." -#: ../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 "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." -#: ../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 "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." -#: ../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 "neoznačený" -#: ../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 "text" @@ -3375,5 +3270,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" @@ -3385,5 +3280,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" @@ -3395,5 +3290,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" @@ -3477,7 +3372,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, fuzzy, java-format +#, java-format msgid "Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "Nemôžem čítať záložky.
{0}" +msgstr "Nemôžem čítať záložky z
''{0}''
Chyba bola: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3508,5 +3403,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "železnica" @@ -3536,151 +3431,38 @@ msgid "{0} member" msgid_plural "{0} members" -msgstr[0] "{0} člen" -msgstr[1] "{0} členovia" -msgstr[2] "{0} členov" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" -"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " -"pripojenia na internet." - -#. 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 "neznámy" - -#: ../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 "" -"Aktualizácia na server neuspešná pretože vaša " -"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa je:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +msgstr[0] "{0} členov" +msgstr[1] "{0} člen" +msgstr[2] "{0} členy" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Predpokladaný priestupok" -#: ../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 "" -"Neúspešné otváranie a pripájanie na vzdialený " -"server
''{0}''
pre bezpečnostné dôvody. Toto je veľmi pravdepodobné " -"pretožestále bežíte
v nejakom applete a pretože nemôžete načítať váš " -"applet z ''{1}''." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" msgstr "Bezpečnostná výnimka" -#: ../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 "" -"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." -"
Prosím, skontrolujte vaše internetové pripojenie." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 msgid "Network exception" msgstr "Sieťová výnimka" -#: ../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 "" -"Nepodarilo sa nahrať dáta na alebo stiahnuť z
\"{0}\"
pre " -"problém pri prenose dát.
Detaily (nepreložené): {1}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" msgstr "IO Výnimka" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 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 "" -"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." -"
Meno hostiteľa ''{1}'' nemôže byť vyriešený.
Prosím skontrolujte API " -"URL vo vašich nastaveniach a vaše internetové pripojenie." - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 +msgstr "Vnútorná chyba servera" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 +#, fuzzy +msgid "Bad Request" +msgstr "Upraviť racquetbal" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Neznámy hostiteľ" -#: ../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 "" -"Aktualizácia neúspešná pretože pôvodné sa " -"snaží
zmazať na servery už zmazané.

Chybová správa je:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Pôvodné je už zmazané" @@ -3825,13 +3607,13 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "možnosti poskytnutia ako Java system properties" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/CESTA/K/JOSM/ZLOŽKE/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "Change the folder for all user settings" -msgstr "" +msgstr "Zmena adresára pre všetký nastavenia užívateľa" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3841,4 +3623,7 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"poznámka: Pre nejakú úlohu, JOSM potrebuje veľa pamäti. To môže byť " +"nevyhnutné k pridaniu nasledujúceho\n" +" Java nastavenie využitia na maximálnu mieru pridelenej pamäti" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3901,5 +3686,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}" @@ -4293,4 +4078,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 @@ -4369,8 +4156,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 @@ -4502,5 +4289,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 "zmazané" @@ -4560,10 +4347,10 @@ #: ../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 "Nie, zrušiť" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4571,7 +4358,7 @@ "yo agree?" msgstr "" -"Ponechať vašu lokálnu verziu, JOSM
má nastaviť id z {0} {1} na 0." -"
Pri ďalšom nahrávaní na server bude priradené
nové id.
Súhlasíte?" +"Držať sa vašej lokálnej verzie, JOSM
má resetnúť id pôvodných {0} " +"na 0.
Pri ďalšom nahrávaní serveru bude priraďovať
toto je nové id." +"
Súhlasíte?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4605,4 +4392,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 @@ -4616,5 +4404,5 @@ msgstr "Pôvodný" -#: ../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 "" @@ -4721,4 +4509,40 @@ msgstr "Ich(their) dátová sada neobsahuje značku s kľúčom {0}" +#: ../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 "Nevyriešený konflikt značiek musí byť vyriešený" + +#: ../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 "Zrušiť rozhodnutie konfliktu" + +#: ../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 "Použiť vyriešený konflikt" + +#: ../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 "Použiť" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4731,72 +4555,69 @@ msgstr "všetky" -#: ../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 "Zvoľte farbu" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgstr "Vybrať hodnotu" + +#: ../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 -#, fuzzy, java-format +msgstr "Prosím rozhodnite ktoré hodnoty zachovať." + +#: ../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 "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "Hodnota ''{0}'' je použitá pre kľúč ''{1}''" + +#: ../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 +msgstr "Kľúč ''{0}'' a všetky jej hodnoty budú odstránené" + +#: ../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}''" -msgstr "" +msgstr "Všetky hodnoty spojené ako ''{0}'' sú použité pre kľúč ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameter ''{0}'' nesmie byť nulový" +msgstr "parameter ''{0}'' nemôže byť prázdny" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}" +msgstr "" +"parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 msgid "tag collection doesn't include the selected value ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +msgstr "zbierka značiek neobsahuje vybrané hodnoty ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" -msgstr "nevymazaný" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +msgstr "ešte žiadne rozhodnutie" + +#: ../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 "Zatiaľ nie je implementované." +msgstr "Ešte nerozhodnuté" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "" +msgstr "Značky z bodov" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "z cesty" +msgstr "Značky z ciest" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Zmazať z relácie (zo vzťahu" +msgstr "Značky z relácií" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konflikt v dátach" +msgstr "Konflikty vo vkladaných značkách" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4822,42 +4643,93 @@ msgstr[2] "{0} relácií" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Rozhodnutie konfliktov" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Rozhodnutie konfliktov" - -#: ../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 "Použiť" - #: ../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 "Vložiť" +msgstr "Vkladám ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "From ..." -msgstr "" +msgstr "Z ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 msgid "To ..." -msgstr "" +msgstr "Do ..." #: ../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} štart" -msgstr[1] "{0} štart" -msgstr[2] "{0} štart" +msgstr[0] "značky" +msgstr[1] "značka" +msgstr[2] "značiek" + +#: ../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 "Odstrániť práve vybraté členy z tejto relácie" + +#: ../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 "miesto" + +#: ../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 +#, fuzzy +msgid "Undecided" +msgstr "Nerozhodnuté" + +#. --- 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 "Funkcia:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 +#, fuzzy +msgid "Tag modified relations with " +msgstr "Značky z relácií" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 +msgid "Key:" +msgstr "Kláves:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Hodnota" + +#: ../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 "Jednosmerka" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revízia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4884,5 +4756,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}" @@ -4915,5 +4787,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." @@ -4993,13 +4865,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 "Vrstva: {0}" +msgstr "Cesta {0}" #: ../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 "Relácie: {0}" +msgstr "Relácia {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5086,5 +4958,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 "" @@ -5144,5 +5016,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 "Pridať" @@ -5192,5 +5064,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 "Relácie" @@ -5285,33 +5157,30 @@ #: ../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[0] "Autori" msgstr[1] "Autor" -msgstr[2] "Autor" +msgstr[2] "Autorov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -#, fuzzy msgid "Select primitives submitted by this user" -msgstr "Výber pôvodných pre vybraté členy relácie" +msgstr "Výber pôvodných, doplnených týmto používateľom" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "Ukázať" +msgstr "Zobraz info" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Viac informácii o tejto vlastnosti" +msgstr "Uvedený prehliadač s informáciou o používateľovi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"VAROVANIE: uvedený prehliadač okien poprvýkrát {0} of {1} {0} of {1} " -"vybrané iba pôvodné" +"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných " +"používateľov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5321,8 +5190,10 @@ "missing on this system." msgstr "" +"Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo
chýbalo v " +"tomto systéme." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 msgid "Missing encoding" -msgstr "" +msgstr "Chýbajúce šifrovanie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 @@ -5387,5 +5258,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}" @@ -5404,9 +5275,4 @@ msgid "Child Relations" msgstr "Relácia dieťa" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" -msgstr "Funkcia:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 @@ -5679,11 +5545,11 @@ msgstr "Spojený" -#: ../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 "Sťahovanie týkajúcich sa relácií" -#: ../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 +#, fuzzy, java-format +msgid "child.getId() >0 expected. Got {1}" msgstr "dieťa.id >0 očakávané. Got {1}" @@ -5697,7 +5563,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Načítať rodičovské(nadriadené) relácie" +msgstr "Nahrávam rodičovskú reláciu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5824,5 +5689,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Miesta" @@ -5900,8 +5765,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "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 "" "Zoom: Koliesko myši, dvojklik alebo Ctrl + Hore/Dole Pohyb mapy: 0 expected, got {0}" -msgstr "dieťa.id >0 očakávané. Got {1}" +msgstr "id > 0 očakávaný, got {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "Nahrávam priebeh pre {0}s id {1}" +msgstr "Nahrať históriu pre bod {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "Nahrávam priebeh pre {0}s id {1}" +msgstr "Nahrať históriu pre cestu {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "Nahrávam priebeh pre {0}s id {1}" +msgstr "Nahrať históriu pre reláciu {0}" #. item "Streets/Motorway" text "Reference" @@ -6838,52 +6703,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 "Názov" @@ -6893,23 +6758,21 @@ msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"Verzia {0} vytvoraná na {1} podľa " -"{2}" +"{2} in changeset {3}" +msgstr "" +"Verzia {0} vytvorená na {1} s " +"{2} v súbore zmien {3}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Zmenová sada {0}" +msgstr "Info súboru zmien" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Viac informácii o tejto vlastnosti" +msgstr "Uvedený prehliadač s informáciou o súbore zmien" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Zmenová sada {0}" +msgstr "Ukázať súbor zmien {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6927,7 +6790,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Názov ulice" +msgstr "Vybrať meno súboru" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6968,12 +6830,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Vyberte prosím hodnotu" +msgstr "Prosím vyberte súbor" #: ../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 "Vrstva ''{0}'' musí byť v zozname vrstiev" +msgstr "Vrstva ''{0}'' nie je podporovaná súborom" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -7015,10 +6876,9 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "Oprava konfliktu (rozporu) značiek" +msgid "Unsaved data and conflicts" +msgstr "Rozhodnutie konfliktov" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -7033,8 +6893,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../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 "" @@ -7051,9 +6910,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 #, fuzzy -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "Použite východzie značky ignorovaného súboru." @@ -7067,7 +6925,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Zrušiť a Ukončiť" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -7080,7 +6937,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Uložiť a Ukončiť" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7158,7 +7014,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Pri nahrávaní" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7167,17 +7022,159 @@ #: ../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 "Použite nový súbor zmien a zatvorte ho" + +#: ../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 "" +"Výber pre nahrávanie dát použije nový súbor zmien a zatvorí súbor zmien po " +"nahratí" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "Použiť nový súbor zmien a nechať to otvoriť" + +#: ../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 "" +"Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien " +"otvorený aj po nahratí" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 +msgid "Upload to a new or to an existing changeset?" +msgstr "Nahrať do nového, alebo existujúceho súboru zmien?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "nahrať všetky zmeny v jednej požiadavke" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +msgid "" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" +"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej " +"požiadavky na zmenené pôvodné" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Doplniť krátky komentár k nahrávaným zmenám" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Nastavenia" + +#: ../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 "Značky pre nový súbor zmien" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Pridané objekty:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Upravené objekty:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Odstránené objekty:" + +#: ../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] "{0} pridaný objekt:" +msgstr[1] "{0} pridané objekty:" +msgstr[2] "{0} pridaných objektov:" + +#: ../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] "{0} upravený objekt:" +msgstr[1] "{0} upravené objekty:" +msgstr[2] "{0} upravených objektov:" + +#: ../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] "{0} zmazaný objekt:" +msgstr[1] "{0} zmazané objekty:" +msgstr[2] "{0} zmazaných objektov:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí" + +#: ../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 "" +"Vybrať pre nahratie existujúci súbor zmien {0} a zavrite súbor zmien po " +"tomto nahratí" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený" + +#: ../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 "" +"Vybrať nahratie do existujúceho súboru zmien {0} a ponechať súbor zmien " +"otvorený pre ďalšie nahratia" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Značky zo súboru zmien {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Nahrať zmeny" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Súbor" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Uložiť tieto úpravy?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Nahrávanie" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Prosím zadajte meno pre umiestnenie." + +#: ../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 +#, fuzzy +msgid "Cancel the upload and resume editing" +msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7414,5 +7411,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." @@ -7470,7 +7466,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Sťahujem dáta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7535,4 +7530,13 @@ msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" + +#: ../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 "" +"Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.
K " +"chcete nahrať stopy (traces), pozrite sem:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7735,5 +7739,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 "Prosím vyberte riadok na odstránenie." @@ -8212,7 +8216,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Ukázať ID objektu v zozname výberu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8227,7 +8230,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Ukázať ID objektu v zozname výberu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8600,8 +8602,4 @@ msgstr "Vypnúť" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Kláves:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8658,5 +8656,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 @@ -8668,42 +8666,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Pridať novú vrstvu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Odstrániť vybranú vrstvu." - -#: ../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 "Viac informácii o tejto vlastnosti" #. 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 "Voliteľné atribúty:" -#: ../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 "Použiť prednastavenie \"{0}\" zo skupiny \"{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 "Použiť prednastavenie \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "uzavratá cesta" -#: ../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 "Neznány typ (druh): {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 @@ -8714,15 +8710,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {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 "Chyba rozkladania(parsovania) {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 "Elementy typu(druhu) {0} sú podporované." -#: ../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 @@ -8733,18 +8729,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../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 "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -8771,5 +8767,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, pravdepodobne chýbajú niektoré značky (tagy)." @@ -8785,7 +8780,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 @@ -8863,5 +8855,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}" @@ -8869,5 +8861,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" @@ -8875,5 +8867,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" @@ -8896,6 +8887,6 @@ "pôvodných" -#: ../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 @@ -8905,20 +8896,20 @@ msgstr "Sťahujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#, java-format msgid "Fetching node with id {0} from ''{1}''" -msgstr "Donášam {0} s id {1} z ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#, java-format msgid "Fetching way with id {0} from ''{1}''" -msgstr "Donášam {0} s id {1} z ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format msgid "Fetching relation with id {0} from ''{1}''" -msgstr "Donášam {0} s id {1} z ''{2}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8926,20 +8917,20 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#, java-format msgid "Fetching a package of nodes from ''{0}''" -msgstr "Donášam balíček z {0} pre ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#, java-format msgid "Fetching a package of ways from ''{0}''" -msgstr "Donášam balíček z {0} pre ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Donášam balíček z {0} pre ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9007,10 +8998,10 @@ msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}" -#: ../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 "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -9020,91 +9011,75 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +msgstr "Vytváranie súboru zmien..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293 #, java-format msgid "Successfully opened changeset {0}" -msgstr "" +msgstr "ˇUspešne otvorený súbor zmien {0}" #: ../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 "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +msgstr "Aktualizácia súboru zmien..." + +#: ../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 +msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 +#, java-format msgid "Updating changeset {0}..." -msgstr "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgstr "Aktualizácia súboru zmien {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "" "Failed to update changeset. Either there is no current changeset or the id " "of the current changeset is 0" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +"Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor zmien, " +"alebo id aktuálneho súboru zmien je 0" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." -msgstr "Zatváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#, fuzzy, java-format +msgstr "Zatváranie súboru zmien..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 +#, java-format msgid "Closing changeset {0}..." -msgstr "Zatváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#, fuzzy, java-format +msgstr "Zatváranie súboru zmien {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#, java-format msgid "Leaving changeset {0} open..." -msgstr "Otváranie kontroly..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +msgstr "Otváram povolený (leaving) súbor zmien {0}..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372 msgid "No changeset present for diff upload" -msgstr "Nie sú prítomné zmenené súbory(changeset) pre diff nahratie." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +msgstr "Nenachádza sa tu súbor zmien pre diff nahratie" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Nahrávam..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409 +#, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." -msgstr "Spúšťam opakovanie {0} z {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../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}." @@ -9123,10 +9098,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 "OSM Serverové Súbory bzip2 zabalené" -#: ../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 "Poškodený bz2 súbor." @@ -9188,6 +9163,11 @@ "
Nepoužite vzácne Heslo." +#: ../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 "Súbory OSM Servera" @@ -9219,5 +9199,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 "OSM Serverové Súbory gzip zbalené" @@ -9283,75 +9263,142 @@ msgstr "Chyba v priebehu parsovania" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Neznáma verzia" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "Chýba číslo verzie z OSM údajov" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "povinný atribút ''{0}'' vynechaný" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "povinný atribút ''{0}'' vynechaný" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "Neznáma verzia: {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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "povinný atribút ''{0}'' vynechaný" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "Nájdený element mimo cesty." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " má nulový ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Nájdený element mimo relácie." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "Neplatné hodnota atribútu \"ref\" člena relácie {0} (hodnota {1})" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "Chýba atribút \"ref\" člena relácie {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Neplatné hodnota atribútu \"ref\" člena relácie {0} (hodnota {1})" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "Chýba atribút \"type\" člena {0} relácie {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "Neočakávaný \"type\" člena {0} relácie {1} (hodnota {2})" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "Neplatné hodnota atribútu \"ref\" člena relácie {0} (hodnota {1})" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Nekompletné špecifikácie s 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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" +"nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Neplatný objekt s 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}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" msgstr "" "Neplatná hodnota atribútu \"version\" v OSM elemente s id {0} (hodnota {1})" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "Neznáma verzia: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" msgstr "Chýba atribút \"version\" v OSM elemente s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Chýba povinný atribút \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" +"nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''" + +#: ../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 "" @@ -9362,16 +9409,30 @@ "vynechaný v nahratých dátach a je preto nekompletná tiež" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, fuzzy, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "Neznámy typ člena relácie {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440 -#, java-format -msgid "Unknown relation member type {0}" -msgstr "Neznámy typ člena relácie {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Pripravujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Zle formulované id bodu" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Rozloženie OSM history data ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Pripravujem dáta..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9418,38 +9479,44 @@ "internetu." -#: ../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} ostáva. Odosielam {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} ostáva. Odosielam {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} ostáva. Odosielam {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 -#, fuzzy, java-format +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 "Nahrávam..." + +#: ../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 "" -"UPOZORNENIE: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " -"požaduje použiť zmenu nastavení, ale API nie je schopné ovládať ich. " -"Ignorujem zmenu nastavení." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 -#, fuzzy -msgid "Starting to upload in one request ..." -msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -#, fuzzy -msgid "Starting to upload with one request per primitive ..." -msgstr "Chyba pri aktualizácii vybraných pôvodných." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 @@ -9487,12 +9554,7 @@ msgstr "Sťahujem Pluginy {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Vynechať sťahovanie" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "JOSM verzia {0} požadovaná pre plugin {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9504,4 +9566,9 @@ msgstr "Vynechať Sťahovanie" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM verzia {0} požadovaná pre plugin {1}." + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9544,20 +9611,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 "Vypnúť doplnok" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Zachovať plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Zachovať plugin" - -#: ../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 " @@ -9567,5 +9634,9 @@ "ich prepísaniu." -#: ../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 "" @@ -9574,10 +9645,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''." -#: ../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 "Podľa informácie v doplnku jeho autorom je ''{0}''." -#: ../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." @@ -9585,9 +9656,9 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../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 "Vypnúť doplnok?" -#: ../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 " @@ -9597,13 +9668,13 @@ "prestal používať." -#: ../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 "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "Informácia o pluginoch" -#: ../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" @@ -9661,4 +9732,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 "neznámy" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9732,4 +9834,117 @@ msgstr "(Text už bol skopírovaný do schránky.)" +#: ../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 "" +"Neúspešná inicializácia komunikácie s OSM serverom {0}." +"
Skontrojujte URL servera vo vašich nastaveniach a vo vašom internetovom " +"pripojení." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java: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 "" +"Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''." +"
The súbor zmien bude automaticky zavretý na servery po vypršaní časového " +"limitu." + +#: ../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 "" +"Aktualizácia na server neuspešná pretože vaša " +"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa je:
{0}" + +#: ../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 "" +"Neúspešné otváranie a pripájanie na vzdialený " +"server
''{0}''
pre bezpečnostné dôvody. Toto je veľmi pravdepodobné " +"pretožestále bežíte
v nejakom applete a pretože nemôžete načítať váš " +"applet z ''{1}''." + +#: ../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 "" +"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." +"
Prosím, skontrolujte vaše internetové pripojenie." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java: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 "" +"Nepodarilo sa nahrať dáta na alebo stiahnuť z
\"{0}\"
pre " +"problém pri prenose dát.
Detaily (nepreložené): {1}" + +#: ../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 "" +"OSM server
''{0}''
hlási vnútornú chybu serveru.
Toto je " +"veľmi pravdepodobne a dočasný problém. Prosím skúste znovu pozdejšie." + +#: ../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 +#, fuzzy +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 "" +"Požiadavka na stiahnutie údajov bola príliš veľká, presiahla maximálny " +"veľkosť oblasti bbox je 0.25. Vyžiadajte si menšiu oblasť, alebo použite " +"planet.osm" + +#: ../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 "" +"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." +"
Meno hostiteľa ''{1}'' nemôže byť vyriešený.
Prosím skontrolujte API " +"URL vo vašich nastaveniach a vaše internetové pripojenie." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java: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 "" +"Aktualizácia neúspešná pretože pôvodné sa " +"snaží
zmazať na servery už zmazané.

Chybová správa je:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9805,5 +10020,5 @@ "bola: {1}" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9812,5 +10027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9819,5 +10034,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9826,5 +10041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9833,5 +10048,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9892,40 +10107,39 @@ msgstr "Nahrať Stopy (Traces)" -#: ../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 "Popis" -#: ../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 "Prosím zapíšte popis a vašej stope(trace)" -#: ../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 "Prosím zapíšte značky o vašej stope(trace)" -#: ../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}" @@ -9933,47 +10147,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 "Pripájam sa..." -#: ../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 "Nahrávanie je zrušené" -#: ../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 "Chyba počas nahrávania" -#: ../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 "Nahratie GPS stopy bolo úspešné" -#: ../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 "Chyba pri nahrávaní. Server napísal nasledujúcu správu: " -#: ../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 "Nahrávam GPS stopu(track): {0}% ({1} of {2})" -#: ../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 "Nie je poskytnutý žiaden popis. Prosím doplňte nejaký popis" -#: ../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 "Nie je vybratá GPX vrstva. Nemôžem nahrať stopu (trace)." -#: ../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 "Nie je doplnené užívateľské meno." -#: ../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 "Nie je doplnené heslo." -#: ../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 "Nahrávam GPX stopu (track)" @@ -10192,5 +10406,5 @@ msgstr "Zatiaľ neoznačkované obrázky" -#: ../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 "Zladiť obrázky s GPX stopou(track)" @@ -10204,13 +10418,13 @@ msgstr "Auto-Guess" -#: ../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 "Môžete vybrať GPX stopu(track)" -#: ../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 "Nevybratá GPX stopa(track)" -#: ../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 "" @@ -10221,9 +10435,9 @@ "Čakám na formát: {0}" -#: ../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 "Neplatné časové pásmo" -#: ../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 "" @@ -10234,65 +10448,65 @@ "Čakám na formát: {0}" -#: ../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 "Neplatné vyrovnanie (offset)" -#: ../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 "Najdené {0} zhody z {1} v GPX stope {2}" -#: ../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 "Nahratá GPX stopa(trasa)" -#: ../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 "Vybraté fotografie neobsahujú informácie o čase." -#: ../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 "Fotografie neobsahujú informácie o čase." -#: ../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 "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." -#: ../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 "GPX Stopa nemá informáciu o čase." -#: ../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 "Časové pásmo: {0}" -#: ../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 "Minút: {0}" -#: ../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 "Sekúnd: {0}" -#: ../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 "Zladené {0} z {1} fotiek k GPX stope." -#: ../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 "(Časový rozdiel z {0} dní)" -#: ../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 "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" -#: ../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 " @@ -10302,13 +10516,13 @@ "posúvač ručne na fotky." -#: ../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 "Priraďovanie fotiek ku stope(track) zlyhalo" -#: ../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 "Nastaviť časové pásmo a vyváženie(offset)" -#: ../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 "Východzie hodnoty" @@ -10349,5 +10563,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 "Chyba pri nahrávaní súboru" @@ -10376,11 +10590,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Mesto/obec {0} je nenájdená, alebo nedostupná na WMS.\n" -"Prosím skontrolujte jej dostupnosť na www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10396,13 +10608,13 @@ msgstr "Vybrať z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../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" @@ -10414,13 +10626,13 @@ "Budete si želať obnoviť F11 pre grabovanie?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "Obnoviť klávesovú skratku pre grabovanie F11" -#: ../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 "JOSM ja zastavený aby zmeny mohli byť prevedené" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10448,7 +10660,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 -#, fuzzy msgid "Disable image cropping during georeferencing." -msgstr "Kliknite na druhý Lambertov priečnik (crosspiece) pre georeferencing\n" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 @@ -10543,9 +10754,9 @@ msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Dodatočný zdroj automatických-značiek:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Pridať \"source=...\" do položiek?" @@ -10635,5 +10846,4 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 -#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" @@ -10641,7 +10851,4 @@ "projections and retry" msgstr "" -"Zapnúť the cadastre WMS plugin, zmeniť\n" -"aktuálnu projekciu na jednu z the cadastre\n" -"projekcií a opakovať" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 @@ -10663,7 +10870,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "nahrávam obrázok..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10681,12 +10887,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 -#, fuzzy msgid "Image georeferencing" -msgstr "Zachytený obrázok bez zemepisných súradníc" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 -#, fuzzy msgid "Click second Lambert crosspiece for georeferencing" -msgstr "Kliknite na druhý Lambertov priečnik (crosspiece) pre georeferencing\n" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 @@ -10713,7 +10917,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Výber" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10802,5 +11005,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 "Prázdna vrstva" @@ -11753,18 +11956,18 @@ msgstr "Neznámy stav problému" -#: ../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 "Otvoriť pohľad..." -#: ../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 "Otvoriť iba súbory, ktoré sú viditeľné v aktuálnom pohľade." -#: ../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 "Žiaden pohľad nie je otvorený - nemôžem určiť hranice!" -#: ../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}" @@ -11775,5 +11978,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11782,9 +11985,9 @@ "Firefox sa nenašiel. Prosím nastavte spúšťací .exe súbor v nastaveniach." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "možnosti pre osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Spúšťací súbor Firefoxu" @@ -11795,28 +11998,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Vytvoriť nový bod." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "zmena výberu" -#: ../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 "zmena pohľadu" -#: ../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 "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne" -#: ../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 "Plugin umožňujúci ovládanie JOSM z iných aplikácií." -#: ../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 "Vzdialené ovládanie" -#: ../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 "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie." -#: ../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 " @@ -11828,28 +12036,35 @@ "využívajúce tento plugin." -#: ../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 "Povolené činnosti" -#: ../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 "Vzdialená kontrola požiadala o načítanie dát z API." -#: ../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 "Detaily požiadavky: {0}" -#: ../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 "Chcete toto povoliť?" -#: ../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 "Potvrdiť činnosť vzdialenej kontroly" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Vzdialená kontrola požiadala o načítanie dát z API." + +#: ../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 "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:" @@ -12353,25 +12568,33 @@ "overte či to nepredstavuje nejakú chybu." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Zadajte hodnoty pre všetky konflikty" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Riešenie konfliktov" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Oprava konfliktu (rozporu) značiek" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Odstránený Prvok z Relácií" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Spojiť plochy: Vymazať krátke cesty" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Uzavretá cesta" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Vymazať značky z vnútorných ciest" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "Funkcie Spojenia Plôch (Join Areas Function)" @@ -12445,6 +12668,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 "Overovanie chýb" @@ -12454,10 +12677,10 @@ msgstr "Žiadne chyby na overenie" -#: ../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 "Mriežka" -#: ../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 "" @@ -12550,51 +12773,66 @@ msgstr "Vykonať overovanie dát" -#: ../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 "Dáta majú chyby. Ak napriek tomu ich nahrať?" -#: ../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 "Otvoriť okno pre overovanie." -#: ../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 "Priblížiť na problém" -#: ../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 "Opraviť" -#: ../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 "Opraviť vybraté chyby." -#: ../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 "Ignorovať" -#: ../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 "Nabudúce ignorovať vybraté chyby." -#: ../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 "Celá skupina" -#: ../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 "Jednotlivé prvky" -#: ../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 "Nič" -#: ../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 "Ignorovať celú skupinu, alebo jednotlivé prvky?" -#: ../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 "Ignorujem prvky(elements)" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#, fuzzy +msgid "Fixing errors ..." +msgstr "Čakanie 10 sekúnd ... " + +#: ../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 "Aktualizácia súboru zmien..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12620,16 +12858,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Tento test kontroluje prítomnosť ciest, železníc a vodných ciest, ktoré sa " -"krížia v rovnakej vrstve, ale nie sú spojené spoločným bodom." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Vytvoriť budovy" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12637,19 +12871,18 @@ msgstr "Zkrížené cesty" -#: ../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 "Duplicitné body" -#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Body s rovnakými názvami" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "Potvrdenie" @@ -12657,19 +12890,16 @@ #: ../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 "Duplikát cesty" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Vytvoriť duplikát cesty" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13250,5 +13480,5 @@ msgstr "Je dosiahnuté spojenie" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Nastavenie výnimky" @@ -13354,5 +13584,5 @@ msgstr "Pridať Rectified Image" -#: ../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 " @@ -13362,5 +13592,5 @@ "skúste znovu." -#: ../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 "Neplatná WMS URL alebo id" @@ -13378,17 +13608,17 @@ msgstr "Prosím vybrať WMS vrstvu pre nastavenie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "Vybrať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "Žačať nastavovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "Žiadne vrstvy na nastavovanie" @@ -13432,19 +13662,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "Aktivovať" - -#: ../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 "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../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 "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13455,14 +13684,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Neplatný dátum" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -13470,102 +13698,113 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../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 "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Nastavenie WMS Pluginu" -#: ../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 "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu" -#: ../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 "Meno v menu" -#: ../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 "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Meno v menu (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS URL (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Zadajte meno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "Kopírovať východzie" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "Zvoľte minimálne jednu cestu." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "Stahovač:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "Prekryť štvorce (tiles)" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% lat:" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% lat:" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TCX Súbory (*.tcx)" +msgstr "" #. * @@ -13978,5 +14217,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 "Ref. číslo" @@ -14518,7 +14757,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Chata" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14539,8 +14777,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 "Požičovňa" +msgstr "" #. color heath @@ -14558,5 +14795,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 "drevo (wood)" @@ -14569,7 +14807,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkovacie lístky" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14605,7 +14842,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "dlažbová kocka (cobblestone)" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14616,7 +14852,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "neúplný" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14627,7 +14862,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "tráva (grass)" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14821,4 +15055,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" @@ -14847,12 +15082,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 "áno" #. color permissive -#. +#. #. 1 #. 40000 @@ -14900,5 +15135,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14935,5 +15170,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14997,6 +15232,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 "nie" @@ -15142,6 +15378,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 "Typ" @@ -15412,7 +15648,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Pešia zóna" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15431,7 +15666,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Špičky (hroty)" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15723,7 +15957,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 "Operátor" @@ -15937,6 +16171,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 "Nadmorská výška" @@ -16855,7 +17089,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" @@ -16903,23 +17134,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 "Otváracia doba" @@ -16943,5 +17174,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" @@ -16988,22 +17218,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 "" @@ -17018,22 +17248,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 "" @@ -17048,22 +17278,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 "" @@ -17097,5 +17327,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 "Referenčné číslo" @@ -17115,7 +17345,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "záchytné parkovisko so zastávkou MHD" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -17129,7 +17358,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapacita" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -17139,12 +17367,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Miesta pre vozíčkárov" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Miesta pre vozíčkárov" +msgstr "" #: build/trans_presets.java:1400 @@ -17346,5 +17572,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Prístrešok" @@ -17729,7 +17955,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Zastaviť (stop)" +msgstr "" #. color tertiary @@ -17772,28 +17997,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "čínska" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Stiahnuť plochu" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Vložiť" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Mesto (city)" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "regionálna" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17821,7 +18041,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Horská turistika" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17835,7 +18054,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "vedľajšia koľaj (napr: na stanici)" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17852,13 +18070,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Hraničná kontrola" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "pre začiatočníkov" +msgstr "" #: build/trans_presets.java:1737 @@ -17875,31 +18091,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "využitie oblasti (landuse)" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informácia" +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 "Bližší popis" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Zvuk" +msgstr "" #. @@ -17910,7 +18121,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefónne číslo" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -18234,5 +18444,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18266,5 +18476,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19394,6 +19604,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 "Náboženstvo" @@ -19402,66 +19612,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 "baháisti" -#: 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 "budhisti" -#: 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 "kresťania" -#: 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 "hinduisti" -#: 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 "džinisti" -#: 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 "judaisti" -#: 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 "moslimovia" -#: 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 "spiritualisti" -#: 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 "taoisti" -#: 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 "unitársky" -#: 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 "zoroastrian" -#: 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 "Vyznanie (cirkevné)" @@ -19470,76 +19680,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 "anglikánska" -#: 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 "baptistická" -#: 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 "katolícka" -#: 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 "evanjelikánska" -#: 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 "svedkovia jehovovi" -#: 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 "lutheránska" -#: 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 "methodistická" -#: 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 "mormónska" -#: 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 "orthodoxná" -#: 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 "pentecostal" -#: 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 "presbiteriánska" -#: 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 "protestanská" -#: 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 "quakerská" -#: 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 "šiítska" -#: 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 "sunnitská" @@ -19871,5 +20081,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 "Poznámka" @@ -19894,5 +20104,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 "Mince" @@ -19900,5 +20110,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 "Bankovky" @@ -19906,5 +20116,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 "Platobné karty a Kreditné karty" @@ -19912,5 +20122,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 "Debetné karty" @@ -19918,5 +20128,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 "Kreditné karty" @@ -19975,10 +20185,144 @@ msgstr "Lavička" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Späť" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Pomník" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "žiadny" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "miesto" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Farba" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Späť" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "dole" + +#. 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 "zelená" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "koniec (end)" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Hodnota" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "voda" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Počet vodičov" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Poľovnícky posed" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Upraviť poľovnícky posed" @@ -19987,30 +20331,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 "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "nízky" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "polovičný" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "úplný" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Skryť" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Zamknúť" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontána" @@ -20019,10 +20363,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Upraviť fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Pitná voda" @@ -20031,10 +20375,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Upraviť pitnú vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Hniezdo záchrany" @@ -20042,35 +20386,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Upraviť hniezdo záchrany" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Obchody" #. 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 "Upraviť supermarket" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Chata" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Upraviť chatu" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Obchod s polotovarmi" @@ -20078,9 +20420,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Upraviť obchod s polotovarmi" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Stánok" @@ -20088,29 +20430,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Upraviť stánok" -#: 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 "Upraviť autobusovú zastávku" - -#: 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 "Upraviť strom" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Predajný automat" @@ -20118,5 +20458,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Upraviť predajný automat" @@ -20124,88 +20464,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Predávané výrobky" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "lístky MHD" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "plány MHD" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkovacie lístky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "jedlo" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "pitie" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "krmivo pre zvieratá" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefónne kupóny (poukážky)" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "kupóny (poukážky)" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "kondómy" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "Prístupové alebo vernostné karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Mäsiareň" @@ -20213,9 +20553,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Upraviť mäsiarstvo" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Chlieb a pečivo" @@ -20223,9 +20563,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Upraviť chlieb a pečivo" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Kvetinárstvo" @@ -20233,18 +20573,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Upraviť kvetinárstvo" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Biopotraviny" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Upraviť biopotraviny" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alkohol" @@ -20252,54 +20592,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Upraviť Obchod s alkoholickými nápojmi" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Nápoje" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "Upraviť Obchod s nápojmi." -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Počítač" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Upraviť počítačový obchod" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektronika" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Upraviť obchod s elektronikou" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Upraviť obchod s Hifi elektronikou" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Nábytok" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Upraviť obchod s nábytkom" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Záhradné centrum" @@ -20307,9 +20647,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Upraviť záhradné centrum" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Železiarstvo" @@ -20317,9 +20657,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Upraviť železiarstvo" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Obchod Urob si sám" @@ -20327,54 +20667,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Upraviť obchod Urob si sám" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Papierníctvo" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Upraviť papierníctvo" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Kaderníctvo" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Upraviť kaderníctvo" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Obuva" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuvou" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Hračky" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Upraviť obchod s hračkami" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Obchod s DVD" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Upraviť obchod s DVD" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Chemická čistiareň" @@ -20382,9 +20722,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Upraviť chemickú čistiareň" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Práčovňa" @@ -20392,9 +20732,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Upraviť práčovňu" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Turistický (Outdoor)" @@ -20402,32 +20742,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Športy" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Upraviť športový obchod" -#: 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 "Upraviť očnú optiku" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Hotovosť" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banka" @@ -20435,14 +20775,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Upraviť banku" -#: 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Zmenáreň" @@ -20450,5 +20790,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Upraviť zmenáreň" @@ -20456,15 +20796,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Upraviť bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Zdravie" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Lekári" @@ -20472,18 +20812,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Upraviť lekárov" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Zubný lekár" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Upraviť zubného lekára" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Lekáreň" @@ -20491,5 +20831,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Upraviť lekáreň" @@ -20497,9 +20837,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "výdaj na recepty" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Nemocnica" @@ -20507,10 +20847,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Upraviť nemocnicu" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Pohotovosť (Záchranná služba)" @@ -20519,5 +20859,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Upraviť pohotovosť (záchrannú službu)" @@ -20526,20 +20866,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Číslo bodu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Meno bodu(miesta)" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefónne číslo" #. 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 "(Použite medzinárodný kód, ako +12-345-67890)" @@ -20547,5 +20887,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 "Veterinár" @@ -20554,55 +20894,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Upraviť veterinárnu ambulanciu" #. 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 "Upraviť kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Krajina (štát)" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Upraviť krajinu (štát)" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Stav" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Upraviť štát" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Oblasť (región)" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Upraviť oblasť (región)" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "kraj (okres)" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Upraviť kraj (okres)" @@ -20610,15 +20950,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Mesto (city)" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Upraviť mesto" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Mesto (town)" @@ -20626,10 +20966,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Upraviť mesto" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Štvrť" @@ -20637,25 +20977,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Upraviť štvrť" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Dedina" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Upraviť dedinu" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Malá dedina / osada / samota" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Upraviť malú dedinu" @@ -20663,5 +21003,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Oblasť (lokalita)" @@ -20669,10 +21009,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Upraviť oblasť (lokalitu)" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ostrov" @@ -20680,24 +21020,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Upraviť Ostrov" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "vľavo" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Upraviť chatu" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Vstup do jaskyne" @@ -20705,10 +21043,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Upraviť vstup do jaskyne" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Vrchol" @@ -20716,10 +21054,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Upraviť vrchol kopca" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Ľadovec" @@ -20727,10 +21065,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Upraviť ľadovec" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Sopka" @@ -20738,70 +21076,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Upraviť sopku" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Štátna" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Upraviť štátne hranice" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administratívne" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Upraviť administratívne hranice" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Občianske" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Upraviť občiansku hranicu" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Politická" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Upraviť politickú hranicu" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Národný park" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Využívanie oblasti (Land use)" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Strom" @@ -20810,15 +21148,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Upraviť strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botanický názov" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Drevo" @@ -20827,5 +21165,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Upraviť Drevo" @@ -20833,17 +21171,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 "ihličnatý" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "zmiešaný" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Les" @@ -20852,14 +21190,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Upraviť les" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Prírodná rezervácia" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Upraviť prírodnú rezerváciu" @@ -20867,25 +21205,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Sutina" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Upraviť sutinu" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Krovie" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Upraviť krovie" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))" @@ -20893,5 +21231,5 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" @@ -20899,5 +21237,5 @@ #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Vresovisko" @@ -20905,5 +21243,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Upraviť vresovisko" @@ -20911,5 +21249,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Farma" @@ -20918,45 +21256,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Upraviť farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Poľnohospodárska pôda" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Upraviť poľnohospodárske pôdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Lúka" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Upraviť lúku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vinica" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Upraviť vinicu" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Ťažobný priestor" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Upraviť ťažobný priestor" @@ -20964,25 +21302,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Záhrada" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Upraviť záhradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Tráva" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Upraviť trávnatú plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Obecná zeleň" @@ -20990,10 +21328,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Upraviť obecnú zeleň" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Spoločné, obecné" @@ -21001,20 +21339,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Upraviť spoločné, obecné" #. 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 "Upraviť park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Rekreačná oblasť" @@ -21022,5 +21360,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Upraviť rekreačnú oblasť" @@ -21028,15 +21366,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Osídlená oblasť (Residential area)" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Upraviť osídlenú oblasť" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Cintorín (malý, blizko kostola)" @@ -21044,9 +21382,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Upraviť cintorín (malý, blizko kostola)" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Cintorín" @@ -21054,39 +21392,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Upraviť cintorín" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Maloobchod" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Upraviť oblasť s maloobchodmi" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Obchodná (komerčná)" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Upraviť obchodnú (komerčnú) oblasť" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Priemysel" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Upraviť priemyselnú oblasť" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Železničný pozemok" @@ -21094,15 +21432,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Upraviť železničný pozemok" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Armáda" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Upraviť vojenskú oblasť" @@ -21110,55 +21448,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Stavebná oblasť" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Upraviť stavebnú oblasť" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Brownfield (opustený priemyselný objekt)" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Upraviť brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Skládka odpadov" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Upraviť skládku odpadov" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Lom" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Upraviť lom" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "multipolygón" @@ -21168,5 +21506,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 "Upraviť multipolygón" @@ -21175,10 +21513,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "obvodová časť (outer segment)" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "vnútorná časť (inner segment)" @@ -21186,5 +21524,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Prikázané smery jazdy (turn restriction)" @@ -21193,5 +21531,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Upraviť prikázané smery jazdy (turn restriction)" @@ -21199,34 +21537,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Obmedzenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "zákaz zabočenia vľavo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "zákaz zabočenia vpravo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "zákaz jazdy priamo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "zákaz otáčania sa" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "prikázané odbočenie vpravo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "prikázané odbočenie vľavo" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "zákaz odbočenia" @@ -21235,15 +21573,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "cez bod alebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "k ceste" @@ -21251,5 +21589,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Cesta (Route)" @@ -21258,5 +21596,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Upraviť Cestu (Route)" @@ -21264,5 +21602,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "Typ Cesty (Route)" @@ -21270,5 +21608,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21334,5 +21672,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 @@ -21341,17 +21679,17 @@ msgstr "bicykel" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "cesta (vozovka)" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "trajekt (prievoz)" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "lyžovanie" @@ -21404,5 +21742,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 @@ -21411,13 +21749,13 @@ msgstr "pešia (foot)" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "turistika" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "električka" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "obchádzka" @@ -21431,10 +21769,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro (subway)" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "Popis značky" @@ -21442,31 +21780,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Sieť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "Route state" msgstr "Štátna cesta" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "proposed" msgstr "plánovaný" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "náhradný" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "dočasný" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "spojenie" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Farba (hex)" @@ -21475,30 +21813,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "cestný úsek" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "predný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "zadný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "bod prerušenia" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "predný bod prerušenia" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "zadný bod prerušenia" @@ -24651,76 +24989,4 @@ msgstr "historické" -#. 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 "zelená" - #. color green #. @@ -25688,172 +25954,70 @@ msgstr "Terraserver Urban" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny." - -#~ msgid "Please select ways with almost right angles to orthogonalize." +#. 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 "Všetky cesty boli prázdne" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Zlúčiť body s rôznymi členmi ?" + +#~ msgid "Merge Anyway" +#~ msgstr "Aj tak zlúčiť" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich " +#~ "chcete zlúčiť ?" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..." + +#~ msgid "" +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." #~ msgstr "" -#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." +#~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol " +#~ "požadovaný. Otvátam nový.." + +#~ msgid "Reusing existing changeset {0}" +#~ msgstr "Znovu použitý existujúci súbor zmien {0}" + +#~ msgid "Unknown version" +#~ msgstr "Neznáma verzia" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Chýba číslo verzie z OSM údajov" + +#~ msgid "Found element in non-way." +#~ msgstr "Nájdený element mimo cesty." + +#~ msgid " has zero ref" +#~ msgstr " má nulový ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Nájdený element mimo relácie." + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "Neočakávaný \"type\" člena {0} relácie {1} (hodnota {2})" + +#~ msgid "Ill-formed node id" +#~ msgstr "Zle formulované id bodu" + +#~ msgid "Move" +#~ msgstr "Presunúť" #~ msgid "No document open so nothing to save." #~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." - -#~ msgid "Change {0} {1}" -#~ msgstr "Zmeniť {0} {1}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Zmazať {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Odstrániť člena relácie {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}" - -#~ msgid "nodes" -#~ msgstr "body" - -#~ msgid "ways" -#~ msgstr "cesty" - -#~ msgid "relations" -#~ msgstr "relácie" - -#~ msgid "changesets" -#~ msgstr "changesets" - -#~ msgid "" -#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. " -#~ "Výnimka: {0}" - -#~ msgid "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " -#~ "was: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. " -#~ "Výnimky boli: {0}" - -#~ msgid "" -#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -#~ "Exception: {0}" -#~ msgstr "" -#~ "Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. " -#~ "Výnimka: {0}" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{0}" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?" - -#~ msgid "Delete Layer" -#~ msgstr "Vymazať vrstvu" - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" - -#~ msgid "Delete all" -#~ msgstr "Zmazať všetko" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Vymazávaná vrstva {0} z {1}" - -#~ msgid "" -#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na " -#~ "vrchu. Výnimka bola: {0}" - -#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka " -#~ "bola: {0}" - -#~ msgid "" -#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. " -#~ "Výnimka bola: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Autori(spracovatelia): {0}" - -#~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" -#~ msgstr "" -#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka " -#~ "bola: {0}" - -#~ msgid "" -#~ "Warning: failed to put history browser always on top. Exception was: {0}" -#~ msgstr "" -#~ "Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka " -#~ "bola: {0}" - -#~ msgid "" -#~ "Failed to close changeset {0}, will be closed by server after timeout. " -#~ "Exception was: {1}" -#~ msgstr "" -#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového " -#~ "limitu servera. Výnimka bola: {1}" - -#~ msgid "Public" -#~ msgstr "Verejné" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org" - -#~ msgid "Set Lambert coordinate" -#~ msgstr "Zvoliť Lambert súradnice" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním." - -#~ msgid "Continue anyway" -#~ msgstr "Pokračovať akokoľvek" - -#~ msgid "Copy Default" -#~ msgstr "Skopírovať východzí" - -#~ msgid "Edit Information Office" -#~ msgstr "Upraviť informačnú kanceláriu" - -#~ msgid "Map Type" -#~ msgstr "Typ mapy" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "citymap" -#~ msgstr "mapa mesta" - -#~ msgid "hikingmap" -#~ msgstr "turistická mapa" - -#~ msgid "bicyclemap" -#~ msgstr "cykloturistická mapa" - -#~ msgid "Board Type" -#~ msgstr "Typ tabuľe" - -#~ msgid "board" -#~ msgstr "tabuľa" - -#~ msgid "Move" -#~ msgstr "Presunúť" #~ msgid "Email" @@ -25932,6 +26096,19 @@ #~ msgstr "Vrstvy: {0}" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." + #~ msgid "Unknown file extension." #~ msgstr "Neznáma prípona súboru" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}" #~ msgid "Login name (email) to the OSM account." @@ -25971,4 +26148,7 @@ #~ msgstr "Importovať TCX súbor..." +#~ msgid "Copy Default" +#~ msgstr "Skopírovať východzí" + #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" @@ -25980,7 +26160,4 @@ #~ msgstr "Upraviť pozíciu WMS vrstvy" -#~ msgid "end" -#~ msgstr "koniec (end)" - #~ msgid "Open the OpenStreetBugs window and activate the automatic download" #~ msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie" @@ -26015,4 +26192,7 @@ #~ msgid "Drawbridge" #~ msgstr "Padací most" + +#~ msgid "map" +#~ msgstr "mapa" #~ msgid "" @@ -26039,4 +26219,7 @@ #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Vložte buď site-josm.xml alebo wiki stránku" + +#~ msgid "Public" +#~ msgstr "Verejné" #~ msgid "false" @@ -26065,4 +26248,7 @@ #~ msgstr "EPSG:4326" +#~ msgid "Delete {1} {0}" +#~ msgstr "Zmazať {1} {0}" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -26074,4 +26260,7 @@ #~ msgid "sports" #~ msgstr "Športový" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org" #~ msgid "Metacarta Map Rectifier image id" @@ -26139,4 +26328,19 @@ #~ msgstr "Mreže" +#~ msgid "citymap" +#~ msgstr "mapa mesta" + +#~ msgid "hikingmap" +#~ msgstr "turistická mapa" + +#~ msgid "bicyclemap" +#~ msgstr "cykloturistická mapa" + +#~ msgid "board" +#~ msgstr "tabuľa" + +#~ msgid "Authors: {0}" +#~ msgstr "Autori(spracovatelia): {0}" + #~ msgid "Server does not support changesets" #~ msgstr "Server neobsahuje kontroly" @@ -26180,4 +26384,7 @@ #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." +#~ msgid "Delete Layer" +#~ msgstr "Vymazať vrstvu" + #~ msgid "Delete and Download" #~ msgstr "Vymazať a Nahrať" @@ -26185,4 +26392,10 @@ #~ msgid "No intersections found. Nothing was changed." #~ msgstr "Priesečník nie je najdený. Nič nebolo zmenené." + +#~ msgid "Continue anyway" +#~ msgstr "Pokračovať akokoľvek" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním." #~ msgid "Move Down" @@ -26227,4 +26440,13 @@ #~ msgid "Edit Portcullis" #~ msgstr "Upraviť mreže" + +#~ msgid "Edit Information Office" +#~ msgstr "Upraviť informačnú kanceláriu" + +#~ msgid "Map Type" +#~ msgstr "Typ mapy" + +#~ msgid "Board Type" +#~ msgstr "Typ tabuľe" #~ msgid "Tagging preset source" @@ -26271,4 +26493,7 @@ #~ msgid "Error processing changeset upload response" #~ msgstr "Chyba pri odpovedi počas nahrávania zmenených súborov." + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny." #~ msgid "Some of the nodes are (almost) in the line" @@ -26331,10 +26556,4 @@ #~ msgstr "zviazané" -#~ msgid "Overlap tiles" -#~ msgstr "Prekryť štvorce (tiles)" - -#~ msgid "% of lat:" -#~ msgstr "% lat:" - #~ msgid "% of lon:" #~ msgstr "% lon:" @@ -26398,4 +26617,16 @@ #~ msgstr "Chýbajúce pôvodné" +#~ msgid "nodes" +#~ msgstr "body" + +#~ msgid "relations" +#~ msgstr "relácie" + +#~ msgid "ways" +#~ msgstr "cesty" + +#~ msgid "changesets" +#~ msgstr "changesets" + #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "Nemôžem nájsť v histórii pôvodné s id {0} v tejto dátovej sade" @@ -26413,4 +26644,10 @@ #~ msgstr "API inicializácia neúspešná" +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{0}" + +#~ msgid "Change {0} {1}" +#~ msgstr "Zmeniť {0} {1}" + #~ msgid "WGS84 Geographisch" #~ msgstr "WGS84 Geographisch" @@ -26431,6 +26668,16 @@ #~ msgstr "Žiadne dáta" +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Odstrániť člena relácie {0} {1}" + #~ msgid "Conflict created" #~ msgstr "Konflikt je vytvorený" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka " +#~ "bola: {0}" #~ msgid "" @@ -26443,2 +26690,73 @@ #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''" + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" + +#~ msgid "" +#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +#~ msgstr "" +#~ "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?" + +#~ msgid "" +#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +#~ "Exception: {0}" +#~ msgstr "" +#~ "Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. " +#~ "Výnimka: {0}" + +#~ msgid "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. " +#~ "Výnimka: {0}" + +#~ msgid "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. " +#~ "Výnimky boli: {0}" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" + +#~ msgid "Deleting layer {0} of {1}" +#~ msgstr "Vymazávaná vrstva {0} z {1}" + +#~ msgid "Delete all" +#~ msgstr "Zmazať všetko" + +#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka " +#~ "bola: {0}" + +#~ msgid "" +#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na " +#~ "vrchu. Výnimka bola: {0}" + +#~ msgid "" +#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. " +#~ "Výnimka bola: {0}" + +#~ msgid "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka " +#~ "bola: {0}" + +#~ msgid "" +#~ "Failed to close changeset {0}, will be closed by server after timeout. " +#~ "Exception was: {1}" +#~ msgstr "" +#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového " +#~ "limitu servera. Výnimka bola: {1}" + +#~ msgid "Set Lambert coordinate" +#~ msgstr "Zvoliť Lambert súradnice" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 17594) +++ /applications/editors/josm/i18n/po/sl.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-18 14:22+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 13:28+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,8 +17,8 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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" @@ -26,5 +26,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 @@ -33,18 +33,20 @@ msgstr "Pomoč" -#: ../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 "" -#: ../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 @@ -60,8 +62,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 @@ -75,6 +77,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 @@ -84,5 +86,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 @@ -102,56 +104,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 "Napaka" -#: ../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] "Nekaj sprememb ni shranjenih." -msgstr[1] "Nekaj sprememb ni shranjenih." -msgstr[2] "Nekaj sprememb ni shranjenih." -msgstr[3] "Nekaj sprememb ni shranjenih." - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Neshranjene spremembe" -#: ../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 "Shrani in končaj" -#: ../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 "Zavrzi in končaj" -#: ../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 @@ -160,11 +157,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 @@ -178,20 +176,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 "Prekliči" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../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 @@ -208,16 +206,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 @@ -247,12 +245,14 @@ msgstr "Pozor" -#: ../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 "" -#: ../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}" @@ -342,5 +342,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 "Vstavki" @@ -471,9 +471,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 @@ -507,6 +507,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 @@ -525,11 +525,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 "Informacije" @@ -551,5 +551,5 @@ msgstr "Prosim, izberite vsaj 3 vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -558,10 +558,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -570,5 +570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -577,9 +577,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -634,26 +634,22 @@ msgstr "" -#: ../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 "Združi poti" -#: ../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 "Združi več poti v eno samo." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "" - -#: ../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 "Združim poti z različnim članstvom?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "" -#: ../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 " @@ -661,13 +657,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Obrnem smeri?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Obrni in združi" -#: ../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 +671,18 @@ msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?" -#: ../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 "" - -#: ../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 "Razreši neskladja" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Združi {0} poti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Vse poti so bile prazne" - -#: ../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 "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Združi {0} poti" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -752,5 +736,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 "Izbriši" @@ -760,15 +744,15 @@ msgstr "Izbriši izbrane predmete." -#: ../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 "Prepiši" -#: ../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 "Datoteka obstaja. Jo nadomestim?" @@ -797,10 +781,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 +815,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 +856,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Vse slike" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1007,1040 +990,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 "Združi vozlišča" -#: ../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 "Združi vozlišča v najstarejšega" -#: ../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 "Izberite vsaj dve vozlišči za združitev" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Vseeno združi" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Združi {0} vozlišč" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Zrcali" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Prezrcali izbrana vozlišča in poti" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Prosim, izberize vsaj eno vozlišče ali pot." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "gor" - -#: ../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 "Premakni predmete {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "dol" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "levo" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "desno" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Premakni {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Premakni predmete {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 "Predmetov ni možno prestaviti s tega sveta." - -#: ../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 "Nova" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Ustvari nov zemljevid." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Odpri ..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Odpri datoteko." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Odpri datoteko." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Neznana vloga ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Odpri mesto ..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Odpri URL naslov." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Ločena plast" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Mesto vira sprejema" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../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 "Izbrano je le eno vozlišče" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "Prilepi" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Prilepi vsebino odložišča" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Prilepi oznake" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Nastavitve ..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Odpri stran z nastavitvami za splošne nastavitve." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Nastavitve" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Ponovi" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Znova uveljavi zadnje razveljavljeno dejanje." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Preimenuj plast" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Hkrati preimenuj datoteko" - -#: ../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 "Obrni poti" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Obrni smer izbranih poti." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Izberite vsaj eno pot" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Obrni smer poti" - -#: ../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 "Shrani" - -#: ../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 "Shrani trenutne podatke" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Datoteka {0} že obstaja. Jo prepišem?" - -#: ../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 "Prazen dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokument ne vsebuje podatkov." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Vseeno shrani" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "V sporu z" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Zavrži spremembe in shrani" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Shrani datoteko OSM" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Shrani datoteko GPX" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "" - -#: ../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 "Shrani kot..." - -#: ../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 "Shrani trenutne podatke v novo datoteko" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Izberi vse" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Prikaži poročilo stanja" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Pomoč: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Poročilo stanja" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopiraj na odložišče in zapri" - -#: ../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 "Zapri" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Razdeli pot" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Razdeli pot pri izbranem vozlišču." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "" - -#: ../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] "Izbrano vozlišče ni na sredini nobene poti." -msgstr[1] "Izbrani vozlišči nista na sredini nobene poti." -msgstr[2] "Izbrana vozlišča niso na sredini nobene poti." -msgstr[3] "Izbrana vozlišča niso na sredini nobene poti." - -#: ../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] "Izbrano vozlišče je del več poti. Prosim, izberite tudi pot." -msgstr[1] "Izbrani vozlišči sta del več poti. Prosim, izberite tudi pot." -msgstr[2] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." -msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Izbrana vozlišča niso del iste poti." - -#: ../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] "Izbrana pot ne vsebuje izbranega vozlišča." -msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč." -msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč." -msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč." - -#: ../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 "Za razdelitev krožne poti izberite dve ali več vozlišč." - -#: ../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 "" -"Poti se ne da razdeliti pri izbranih vozliščih. (Namig: Izberite vozlišča na " -"sredini poti.)" - -#: ../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 "Razdeli pot {0} na {1} delov" - -#: ../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 -#, fuzzy -msgid "Close the current changeset ..." -msgstr "Shrani trenutne podatke" - -#: ../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 "paket sprememb" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "paket sprememb" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Riši črte med točkami GPS sledi." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Izberite bodisi:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* Eno vozlišče z oznakami" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Eno vozlišče, ki je del več poti, ali" - -#: ../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 "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" - -#: ../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 "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" - -#: ../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 "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Razmnoži v {0} vozlišč" - -#. 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 "Razmnoži {0} vozlišč v {1} vozlišč" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Izniči" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Izniči zadnje dejanje." - -#: ../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 "Počisti izbor" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Odizberi vse predmete" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Posodobitev podatkov" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Posodobitev trenutne podatkovne plasti (ponoven sprejem s strežnika)" - -#. 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 "" - -#: ../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 "Posodobi izbor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Izbor je prazen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Pošlji v OSM ..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Pošlji vse spremembe na strežnik OSM." - -#: ../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 "Obstajajo nerazrešeni konflikti. Razrešite jih." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Ni sprememb za pošiljanje." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Pošljem te spremembe?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "" - -#: ../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 "Dodaj novo vozlišče v pot" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Nastavitve zemljevida" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "paket sprememb" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Novi predmeti:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Spremenjeni predmeti:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Izbrisani predmeti:" - -#: ../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] "Novi predmeti:" -msgstr[1] "Novi predmeti:" -msgstr[2] "Novi predmeti:" -msgstr[3] "Novi predmeti:" - -#: ../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] "Spremenjeni predmeti:" -msgstr[1] "Spremenjeni predmeti:" -msgstr[2] "Spremenjeni predmeti:" -msgstr[3] "Spremenjeni predmeti:" - -#: ../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] "Izbrisani predmeti:" -msgstr[1] "Izbrisani predmeti:" -msgstr[2] "Izbrisani predmeti:" -msgstr[3] "Izbrisani predmeti:" - -#: ../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 "Zadnja sprememba {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Povečaj" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zmanjšaj" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Nazaj" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Skok nazaj" - -#: ../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 "Zvok: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Hitreje" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Hitreje naprej" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Naprej" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Skok naprej" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Naslednji označevalnik" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Predvajanje/Premor" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Predvajaj/ustavi zvok" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Prejšnji označevalnik" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Počasneje" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Počasneje naprej" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Sprejem podatkov GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Surovi podatki GPS" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Sprejem podatkov" - -#: ../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 "Nič podatkov ni bilo uvoženih." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Podatki OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Sprejem {0} od {1} (še {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Napake pri sprejemu" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Način za brisanje" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Izbriši vozlišča ali poti" - -#: ../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 "Način: {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 +1019,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 +1029,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 +1059,876 @@ msgstr "parameter ''{0}'' ne sme biti ničen" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Združi {0} vozlišč" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "Zrcali" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Prezrcali izbrana vozlišča in poti" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Prosim, izberize vsaj eno vozlišče ali pot." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "gor" + +#: ../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 "Premakni predmete {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "dol" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "levo" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "desno" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Premakni {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Premakni predmete {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 "Predmetov ni možno prestaviti s tega sveta." + +#: ../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 "Nova" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Ustvari nov zemljevid." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Odpri ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Odpri datoteko." + +#: ../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 "Odpri mesto ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Odpri URL naslov." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Ločena plast" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Mesto vira sprejema" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" + +#: ../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 "Izbrano je le eno vozlišče" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "Prilepi" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Prilepi vsebino odložišča" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Prilepi oznake" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" + +#: ../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 "Nastavitve ..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Odpri stran z nastavitvami za splošne nastavitve." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Nastavitve" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Ponovi" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Znova uveljavi zadnje razveljavljeno dejanje." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Preimenuj plast" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Hkrati preimenuj datoteko" + +#: ../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 "Obrni poti" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Obrni smer izbranih poti." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Izberite vsaj eno pot" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Obrni smer poti" + +#: ../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 "Shrani" + +#: ../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 "Shrani trenutne podatke" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Datoteka {0} že obstaja. Jo prepišem?" + +#: ../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 "Prazen dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Vseeno shrani" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokument ne vsebuje podatkov." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "V sporu z" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Zavrži spremembe in shrani" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Shrani datoteko OSM" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Shrani datoteko GPX" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "" + +#: ../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 "Shrani kot..." + +#: ../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 "Shrani trenutne podatke v novo datoteko" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Izberi vse" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Prikaži poročilo stanja" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Pomoč: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Poročilo stanja" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopiraj na odložišče in zapri" + +#: ../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 "Zapri" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Razdeli pot" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Razdeli pot pri izbranem vozlišču." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "" + +#: ../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] "Izbrano vozlišče ni na sredini nobene poti." +msgstr[1] "Izbrani vozlišči nista na sredini nobene poti." +msgstr[2] "Izbrana vozlišča niso na sredini nobene poti." +msgstr[3] "Izbrana vozlišča niso na sredini nobene poti." + +#: ../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] "Izbrano vozlišče je del več poti. Prosim, izberite tudi pot." +msgstr[1] "Izbrani vozlišči sta del več poti. Prosim, izberite tudi pot." +msgstr[2] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." +msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Izbrana vozlišča niso del iste poti." + +#: ../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] "Izbrana pot ne vsebuje izbranega vozlišča." +msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč." +msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč." +msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč." + +#: ../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 "Za razdelitev krožne poti izberite dve ali več vozlišč." + +#: ../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 "" +"Poti se ne da razdeliti pri izbranih vozliščih. (Namig: Izberite vozlišča na " +"sredini poti.)" + +#: ../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 "Razdeli pot {0} na {1} delov" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Riši črte med točkami GPS sledi." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Izberite bodisi:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* Eno vozlišče z oznakami" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Eno vozlišče, ki je del več poti, ali" + +#: ../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 "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" + +#: ../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 "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" + +#: ../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 "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Razmnoži v {0} vozlišč" + +#. 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 "Razmnoži {0} vozlišč v {1} vozlišč" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Izniči" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Izniči zadnje dejanje." + +#: ../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 "Počisti izbor" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Odizberi vse predmete" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Posodobitev podatkov" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Posodobitev trenutne podatkovne plasti (ponoven sprejem s strežnika)" + +#. 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 "" + +#: ../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 "Posodobi izbor" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Izbor je prazen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Pošlji v OSM ..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Pošlji vse spremembe na strežnik OSM." + +#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Ni sprememb za pošiljanje." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "Povečaj" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zmanjšaj" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Nazaj" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Skok nazaj" + +#: ../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 "Zvok: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Hitreje" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Hitreje naprej" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Naprej" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Skok naprej" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Naslednji označevalnik" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Predvajanje/Premor" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Predvajaj/ustavi zvok" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Prejšnji označevalnik" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Počasneje" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Počasneje naprej" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Sprejem podatkov GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Surovi podatki GPS" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Sprejem podatkov" + +#: ../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 "Nič podatkov ni bilo uvoženih." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Podatki OpenStreetMap" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Sprejem {0} od {1} (še {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Napake pri sprejemu" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Način za brisanje" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Izbriši vozlišča ali poti" + +#: ../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 "Način: {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 @@ -2202,18 +2043,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 "Izberite" -#: ../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 "Izberi, premakni ali zasuči predmete" -#: ../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" @@ -2222,18 +2063,18 @@ 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 "Premakni elemente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Premakni jih" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Razveljavi premik" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2241,9 +2082,6 @@ "Really move them?" msgstr "" -"Premaknili ste več kot {0} elementov. Sočasen premik velikega števila " -"elementov je pogosto nenamerno.\n" -"Naj jih zares premaknem?" - -#: ../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 "" @@ -2410,41 +2248,41 @@ msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Začni iskanje" -#: ../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 "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../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 "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../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 "Najdeno {0} zadetkov" -#: ../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 "" @@ -2454,40 +2292,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 "" -#: ../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 "" @@ -2496,5 +2334,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." @@ -2531,62 +2369,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Dodaj vozlišče" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Dodaj {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "relacije" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Spremeni {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Spremeni {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Spremeni relacijo" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Odstrani \"{0}\" pri {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Odstrani \"{0}\" pri {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Odstrani \"{0}\" pri {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Nastavi {0}={1} pri {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Nastavi {0}={1} pri {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Nastavi {0}={1} pri {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2658,38 +2496,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] "Izbriši {0} {1}" -msgstr[1] "Izbriši {0} {1}" -msgstr[2] "Izbriši {0} {1}" -msgstr[3] "Izbriši {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] "Način za brisanje" -msgstr[1] "Način za brisanje" -msgstr[2] "Način za brisanje" -msgstr[3] "Način za brisanje" +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] "Izbriši {0} {1}" -msgstr[1] "Izbriši {0} {1}" -msgstr[2] "Izbriši {0} {1}" -msgstr[3] "Izbriši {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] "Izbriši izbrano relacijo" -msgstr[1] "Izbriši izbrano relacijo" -msgstr[2] "Izbriši izbrano relacijo" -msgstr[3] "Izbriši izbrano relacijo" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2703,20 +2533,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n" -"Izbrišem iz relacije?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n" -"Izbrišem iz relacije?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2727,5 +2553,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." @@ -2803,17 +2629,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2823,17 +2649,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Razreši {0} sporov v {1} predmetih" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3038,5 +2864,5 @@ msgstr "V" -#: ../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 @@ -3044,23 +2870,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 "parameter ''{0}'' ne sme biti ničen" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../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 "Opozorilo: {0}" -#: ../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 @@ -3073,11 +2924,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 "" @@ -3128,9 +2984,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." @@ -3139,118 +2995,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 "Neznana vloga ''{0}''." -#: ../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 "besedilo" @@ -3273,5 +3129,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" @@ -3284,5 +3140,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" @@ -3295,5 +3151,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" @@ -3404,5 +3260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "železnica" @@ -3438,127 +3294,33 @@ msgstr[3] "{0} člani" -#: ../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 "neznan" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "Neznan gostitelj" -#: ../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 "" @@ -3769,5 +3531,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}" @@ -4144,4 +3906,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 @@ -4213,8 +3977,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 @@ -4337,5 +4101,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 "izbrisano" @@ -4395,5 +4159,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 "" @@ -4435,4 +4199,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 @@ -4446,5 +4211,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 "" @@ -4550,4 +4315,39 @@ 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 +msgid "No conflicts to resolve" +msgstr "" + +#: ../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 @@ -4560,24 +4360,23 @@ msgstr "" -#: ../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 "Izberite barvo" - -#: ../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}''" @@ -4585,7 +4384,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 "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4598,14 +4397,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 "Še ni podprto." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4618,7 +4418,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Spremeni relacijo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4646,24 +4445,8 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Odpravljanje sporov" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Razreši neskladja" - -#: ../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 "Prilepi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4678,11 +4461,72 @@ #: ../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} točk" -msgstr[1] "{0} točka" -msgstr[2] "{0} točki" -msgstr[3] "{0} točke" +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 +msgid "Remove this relation member from the relation" +msgstr "" + +#: ../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 "Resnično ime" + +#: ../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 "Tipka:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Vrednost" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Različica" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4709,5 +4553,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}" @@ -4738,5 +4582,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." @@ -4809,13 +4653,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 "Zemljevid: {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 "Relacija" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4903,5 +4747,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 "" @@ -4962,5 +4806,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 "Dodaj" @@ -5010,5 +4854,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 "Relacije" @@ -5101,11 +4945,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] "Avtor" -msgstr[1] "Avtor" -msgstr[2] "Avtor" -msgstr[3] "Avtor" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5198,5 +5040,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}" @@ -5214,9 +5056,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 "" @@ -5467,11 +5304,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 "" @@ -5485,7 +5322,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Nalaganje zgodnjih vstavkov" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5610,5 +5446,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Kraji" @@ -5686,9 +5522,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Povečava: Miškino kolesce ali dvojni klik. Premik: Desni miškin gumb in " +"premik. Izbor: Kliknite z miško in povlecite" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5737,7 +5576,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Prenos trenutnih nastavitev na strežnik" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6620,52 +6458,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 "Naziv" @@ -6675,11 +6513,10 @@ 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 "paket sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 @@ -6688,7 +6525,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Zadnja sprememba {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6706,7 +6543,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Ime ceste" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6747,12 +6583,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Izberite vrednost" +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 "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6794,9 +6629,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6812,9 +6645,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" #: ../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 "" @@ -6831,9 +6662,7 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6847,7 +6676,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Zavrzi in končaj" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6860,7 +6688,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Shrani in končaj" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6946,12 +6773,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Novi predmeti:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Spremenjeni predmeti:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Izbrisani predmeti:" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Datoteka" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Pošljem te spremembe?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Pošiljanje" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Prosim, vnesite ime kraja." + +#: ../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 @@ -7190,5 +7146,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." @@ -7244,7 +7199,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Sprejem podatkov" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7305,4 +7259,10 @@ msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7497,5 +7457,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 "Prosim izberite vrstico za izbris." @@ -8312,8 +8272,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Tipka:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8370,5 +8326,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 @@ -8379,42 +8335,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Dodaj vozlišče v pot" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Izbriši izbrano plast." - -#: ../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 "" #. 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 "" -#: ../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 "Uporabi prednastavitev ''{0}'' iz skupine ''{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 "Uporabi prednastavitev ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "" -#: ../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 @@ -8425,15 +8379,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {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 "" -#: ../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 "" -#: ../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 @@ -8445,18 +8399,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../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 "" -#: ../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 "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -8483,5 +8437,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 "" @@ -8497,7 +8450,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 @@ -8575,5 +8525,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}" @@ -8581,5 +8531,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" @@ -8587,5 +8537,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" @@ -8606,6 +8555,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 @@ -8615,40 +8564,40 @@ msgstr "Sprejemanje podatkov OSM..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8710,10 +8659,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 "" @@ -8721,11 +8670,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 "Pripravljam podatke..." - -#: ../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}" @@ -8733,34 +8680,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 -#, java-format -msgid "Reusing existing changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "paket sprememb" - -#: ../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 "Zadnja sprememba {0}" - -#: ../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 " @@ -8768,44 +8699,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "" -#: ../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 "Kontaktiraj {0}..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Leaving changeset {0} open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +#: ../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 "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../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}." @@ -8824,10 +8755,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 "" @@ -8885,6 +8816,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 "" @@ -8913,5 +8849,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 "" @@ -8968,74 +8904,139 @@ msgstr "Napaka med razčlenjevanjem." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Neznana različica" - -#: ../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 +#, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "končna različica:" + +#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "" - -#: ../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 "" -#: ../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 "predmet z id=0 ni dovoljen" -#: ../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 +#, java-format +msgid "Missing required attribute ''{0}''." msgstr "" #: ../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 "" @@ -9044,16 +9045,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 "Priprava podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Neveljaven id točke" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Priprava podatkov OSM..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Pripravljam podatke..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9100,33 +9115,43 @@ "internetom." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#: ../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 "Pošiljanje ..." + +#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9164,11 +9189,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 "" @@ -9181,4 +9201,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 @@ -9220,20 +9245,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 "Onemogoči vstavek" #: ../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 "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?" -#: ../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 " @@ -9243,5 +9268,9 @@ "prepisati obstoječe datoteke." -#: ../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 "" @@ -9250,10 +9279,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''." -#: ../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 "Glede na podatke znotraj vstavka je avtor {0}." -#: ../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." @@ -9261,9 +9290,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../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 "Naj vstavek onemogočim?" -#: ../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 " @@ -9273,13 +9302,13 @@ "njegovo odstranitev iz spomina." -#: ../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" @@ -9338,4 +9367,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 "neznan" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9408,4 +9468,88 @@ msgstr "(besedilo je že bilo prekopirano na odložišče.)" +#: ../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 @@ -9468,5 +9612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9475,5 +9619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9482,5 +9626,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9489,5 +9633,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9496,5 +9640,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9553,40 +9697,39 @@ msgstr "Pošiljanje sledi" -#: ../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 "Opis" -#: ../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}" @@ -9594,47 +9737,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 "Sled GPX je bila uspešno poslana" -#: ../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 "Pošiljanje sledi GPX: {0}% ({1} od {2})" -#: ../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 "Ni obveznega opisa. Prosimo, vpišite opis sledi." -#: ../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 "Ni izbrana plast GPX. Sledi ni mogoče poslati." -#: ../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 "Pošiljanje sledi GPX" @@ -9843,5 +9986,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 "" @@ -9855,13 +9998,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 "" @@ -9870,9 +10013,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 "" @@ -9881,65 +10024,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 " @@ -9947,13 +10090,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 "" @@ -9991,5 +10134,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 "" @@ -10036,13 +10179,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" @@ -10051,13 +10194,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 "" @@ -10167,9 +10310,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 "" @@ -10322,7 +10465,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Izberite" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10406,5 +10548,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 "Prazna plast" @@ -11328,18 +11470,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 "Odpri vidne ..." -#: ../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 "Odpri le datoteke, ki so vidne v trenutnem pogledu." -#: ../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}" @@ -11350,5 +11492,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 " @@ -11356,9 +11498,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 "" @@ -11369,28 +11511,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Ustvari novo vozlišče." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "spremeni izbor" -#: ../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 " @@ -11399,28 +11546,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 "" @@ -11911,25 +12064,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Razreši neskladja" + #: ../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 "" @@ -12001,6 +12162,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 "" @@ -12010,10 +12171,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 "Mreža" -#: ../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 "" @@ -12100,52 +12261,66 @@ msgstr "Izvede preverbo veljavnosti podatkov" -#: ../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 "Napake v podatkih. Vseeno pošljem?" -#: ../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 "Povečava na težavo" -#: ../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 "Popravi" -#: ../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 "Popravi izbrane napake" -#: ../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 "Prezri" -#: ../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 "Naslednjič prezri izbrane napake." -#: ../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 "Celotna skupina" -#: ../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 "Posamezen element" -#: ../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 "Nič" -#: ../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 "Prezri celotno skupino ali posamezne elemente?" -#: ../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 "Preziranje elementov" +#: ../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 "Pošiljanje ..." + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 #, java-format @@ -12176,7 +12351,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "zgradba" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12184,18 +12358,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 "Podvojena vozlišča" -#: ../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 "" @@ -12203,7 +12377,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 "Podvojena vozlišča" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12214,7 +12387,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Izbriši vozlišča ali poti" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12779,5 +12951,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12861,5 +13033,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 " @@ -12867,5 +13039,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 "" @@ -12883,17 +13055,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 "" @@ -12937,15 +13109,15 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +#: ../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 "" @@ -12956,108 +13128,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 "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../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 "Shrani plast WMS v datoteko" -#: ../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 "Naloži plast WMS iz datoteke" -#: ../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 "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../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 "WMS" -#: ../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 "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Nastavitve WMS vstavka" -#: ../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 "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka" -#: ../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 "Naziv v meniju" -#: ../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 "Povezava do WMS" -#: ../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 "Vpišite ime za meni in povezavo do WMS" -#: ../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 "Povečava na izbrane predmete" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy -msgid "Please select at least one row to copy." -msgstr "Izberite vsaj eno pot" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" +msgid "Overlap tiles" +msgstr "Prekrivajoče površine" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" msgstr "" @@ -13423,5 +13606,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 "" @@ -13983,8 +14166,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 "Izposojevalnica" +msgstr "" #. color heath @@ -14002,5 +14184,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 "" @@ -14048,7 +14231,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "izbor" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14059,7 +14241,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "nepopoln" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14263,4 +14444,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" @@ -14289,12 +14471,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 "da" #. color permissive -#. +#. #. 1 #. 40000 @@ -14342,5 +14524,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14377,5 +14559,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14439,6 +14621,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 "" @@ -14584,6 +14767,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 "Vrsta" @@ -14872,7 +15055,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Ovire" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15164,7 +15346,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 "" @@ -15377,6 +15559,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 "" @@ -16288,7 +16470,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" @@ -16336,23 +16515,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 "" @@ -16376,5 +16555,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" @@ -16421,22 +16599,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 "" @@ -16451,22 +16629,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 "" @@ -16481,22 +16659,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 "" @@ -16530,5 +16708,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 "" @@ -16775,5 +16953,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17158,7 +17336,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stop znak" +msgstr "" #. color tertiary @@ -17205,13 +17382,11 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Sprejmi področje" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Prilepi" +msgstr "" #: build/trans_presets.java:1721 @@ -17220,7 +17395,6 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "relacije" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17261,7 +17435,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "zgradba" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17278,13 +17451,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Uredi kontinent" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Policijska postaja" +msgstr "" #: build/trans_presets.java:1737 @@ -17301,7 +17472,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "raba tal" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17312,19 +17482,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Informacije" +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 "Opis GPS sledi" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Zvok" +msgstr "" #. @@ -17658,5 +17825,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17690,5 +17857,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18814,6 +18981,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 "Vera" @@ -18822,66 +18989,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -18890,76 +19057,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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -19291,5 +19458,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 "" @@ -19314,5 +19481,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 "Kovanci" @@ -19320,5 +19487,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 "Bankovci" @@ -19326,5 +19493,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 "" @@ -19332,5 +19499,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 "Debetne kartice" @@ -19338,5 +19505,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 "Kreditne kartice" @@ -19395,10 +19562,141 @@ msgstr "Klopca" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Nazaj" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Slap" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "brez" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "Osnovno" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Barva" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Nazaj" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "dol" + +#. 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 "" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Vrednost" + +#: build/trans_presets.java:2435 +msgid "white" +msgstr "" + +#: 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 "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19407,30 +19705,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 "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "" @@ -19439,10 +19737,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Pitna voda" @@ -19451,10 +19749,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Uredi pitno vodo" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19462,34 +19760,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 "Trgovine" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "" -#: 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 "Uredi grad" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "" @@ -19497,9 +19794,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "" @@ -19507,29 +19804,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "" -#: 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 "Uredu avtobusno postajališče" - -#: 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 "Uredi drevo" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Prodajni avtomat" @@ -19537,5 +19832,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Uredi prodajni avtomat" @@ -19543,88 +19838,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Prodajani izdelki" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "pijača" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM kartice" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "Mesar" @@ -19632,9 +19927,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Uredi mesarja" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Pekarna" @@ -19642,9 +19937,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Uredi pekarno" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "" @@ -19652,18 +19947,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19671,54 +19966,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19726,9 +20021,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19736,9 +20031,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Sam svoj mojster" @@ -19746,54 +20041,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Uredi sam svoj mojster trgovino" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Čistilnica" @@ -19801,9 +20096,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Uredi čistilnico" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Pralnica" @@ -19811,9 +20106,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Uredi pralnico" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "" @@ -19821,32 +20116,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Denar" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banka" @@ -19854,14 +20149,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Uredi banko" -#: 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 "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Menjalnica" @@ -19869,5 +20164,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Uredi menjalnico" @@ -19875,15 +20170,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Uredi bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Zdravje" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "" @@ -19891,18 +20186,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Lekarna" @@ -19910,5 +20205,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Uredi lekarno" @@ -19916,9 +20211,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Bolnišnica" @@ -19926,10 +20221,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Uredi bolnišnico" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -19938,5 +20233,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -19945,20 +20240,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "" #. 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 "" @@ -19966,5 +20261,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 "" @@ -19973,55 +20268,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "" #. 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 "Uredi kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Država" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Uredi državo" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "" @@ -20029,15 +20324,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "" @@ -20045,10 +20340,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "" @@ -20056,25 +20351,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Vas" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Uredi vas" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Zaselek" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Uredi zaselek" @@ -20082,5 +20377,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20088,10 +20383,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Otok" @@ -20099,24 +20394,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Uredi otok" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "levo" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Uredi grad" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "" @@ -20124,10 +20417,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Vrh" @@ -20135,10 +20428,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Uredi vrh" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "" @@ -20146,10 +20439,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "" @@ -20157,70 +20450,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Meje" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Raba tal" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Drevo" @@ -20229,15 +20522,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Uredi drevo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "" @@ -20246,5 +20539,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "" @@ -20252,17 +20545,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 "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Gozd" @@ -20271,14 +20564,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Uredi gozdnata tla" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Naravni rezervat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Uredi naravni rezervat" @@ -20286,25 +20579,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20312,10 +20605,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20323,5 +20616,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20329,5 +20622,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20336,45 +20629,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vinograd" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Uredi vinograd" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20382,25 +20675,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20408,10 +20701,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20419,20 +20712,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20440,5 +20733,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20446,15 +20739,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Pokopališče" @@ -20462,9 +20755,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Uredi pokopališče" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "" @@ -20472,39 +20765,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Ozemlje železnice" @@ -20512,15 +20805,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Uredi ozemlje železnice" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20528,55 +20821,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Gradbišče" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Kamnolom" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Uredi kamnolom" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20586,5 +20879,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 "" @@ -20593,10 +20886,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20604,5 +20897,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20611,5 +20904,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20617,34 +20910,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20653,15 +20946,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20669,5 +20962,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20676,5 +20969,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20682,5 +20975,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20688,5 +20981,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20752,5 +21045,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 @@ -20759,17 +21052,17 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20822,5 +21115,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 @@ -20829,13 +21122,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20849,10 +21142,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20860,31 +21153,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20893,30 +21186,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24069,76 +24362,4 @@ msgstr "" -#. 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 "" - #. color green #. @@ -25106,47 +25327,38 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na " -#~ "strežnik." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Dokument ni odprt, zato ni kaj shraniti." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Izbriši {1} {0}" +#. 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 "Vse poti so bile prazne" + +#~ msgid "Merge Anyway" +#~ msgstr "Vseeno združi" + +#~ msgid "Unknown version" +#~ msgstr "Neznana različica" + +#~ msgid "Ill-formed node id" +#~ msgstr "Neveljaven id točke" + +#~ msgid "Move" +#~ msgstr "Premakni" + +#~ msgid "Data Layer" +#~ msgstr "Podatkovna plast" #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}" -#~ msgid "nodes" -#~ msgstr "vozlišča" - -#~ msgid "ways" -#~ msgstr "poti" - -#~ msgid "relations" -#~ msgstr "relacije" - -#~ msgid "changesets" -#~ msgstr "paketi sprememb" - -#~ msgid "Public" -#~ msgstr "Javna" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org" - -#~ msgid "Move" -#~ msgstr "Premakni" - -#~ msgid "Data Layer" -#~ msgstr "Podatkovna plast" - #~ msgid "their version:" #~ msgstr "njihova različica:" - -#~ msgid "resolved version:" -#~ msgstr "končna različica:" #~ msgid "my version:" @@ -25187,4 +25399,7 @@ #~ msgstr "Spremeni" +#~ msgid "No document open so nothing to save." +#~ msgstr "Dokument ni odprt, zato ni kaj shraniti." + #~ msgid "Email" #~ msgstr "E-pošta" @@ -25192,4 +25407,9 @@ #~ msgid "unnamed" #~ msgstr "neimenovano" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na " +#~ "strežnik." #~ msgid "Unknown file extension." @@ -25209,14 +25429,10 @@ #~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" +#~ msgid "Delete {1} {0}" +#~ msgstr "Izbriši {1} {0}" + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" #~ "Za premikanje in povečavo lahko uporabite miško ali +." - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Povečava: Miškino kolesce ali dvojni klik. Premik: Desni miškin gumb in " -#~ "premik. Izbor: Kliknite z miško in povlecite" #~ msgid "Validate either current selection or complete dataset." @@ -25251,4 +25467,10 @@ #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}." + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Javna" #~ msgid "" @@ -25274,7 +25496,4 @@ #~ msgstr "Odstrani izbrano" -#~ msgid "Basic" -#~ msgstr "Osnovno" - #~ msgid "Add all currently selected objects as members" #~ msgstr "Dodaj kot člane vse trenutno izbrane predmete" @@ -25291,2 +25510,14 @@ #~ msgid "Update failed" #~ msgstr "Posodobitev ni uspela" + +#~ msgid "ways" +#~ msgstr "poti" + +#~ msgid "nodes" +#~ msgstr "vozlišča" + +#~ msgid "relations" +#~ msgstr "relacije" + +#~ msgid "changesets" +#~ msgstr "paketi sprememb" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 17594) +++ /applications/editors/josm/i18n/po/sv.po (revision 17595) @@ -8,7 +8,7 @@ "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-04 10:57+0000\n" -"Last-Translator: Konrad Skeri \n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-09 10:16+0000\n" +"Last-Translator: Mattias Dalkvist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\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:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:04+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 "Hjälp" -#: ../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 "Projektionen {0} kunde inte aktiveras. Använder Merkator" -#: ../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,53 @@ #: ../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 "Fel" -#: ../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] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" -msgstr[1] "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?" +msgstr[1] "" +"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Osparade ändringar" -#: ../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 "Spara och avsluta" -#: ../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 "Kassera och avsluta" -#: ../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 +158,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 +177,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 "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{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 +207,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,15 +246,17 @@ msgstr "Varning" -#: ../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 "Hoppar över felaktig URL till en fil: \"{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}" -msgstr "" +msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -339,5 +343,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 "Insticksmoduler" @@ -352,20 +356,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för " -"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy, java-format +#, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to user page for OSM " "user will probably fail. API base URL is: ''{0}''" msgstr "" -"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för " -"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -384,9 +384,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." -msgstr "" +msgstr "Välj ett mål lager." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 msgid "Select target layer" -msgstr "" +msgstr "Välj ett mål lager." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 @@ -394,5 +394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469 msgid "Merge" -msgstr "" +msgstr "Sammanfoga" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 @@ -402,8 +402,10 @@ "" msgstr "" +"Det finns inga lager som lagret
''{0}''
kan sammanfogas med." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" -msgstr "" +msgstr "Inga mål lager" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -474,9 +476,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 @@ -510,6 +512,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 @@ -528,11 +530,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 "Information" @@ -554,5 +556,5 @@ msgstr "Välj åtminstone tre noder." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -563,10 +565,10 @@ "är {0}, max är {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 "Bryter mot API:ns möjligheter" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -577,5 +579,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -586,9 +588,9 @@ "tillåtna längden ({2}). Värdets längd är {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -644,76 +646,60 @@ msgstr "Det finns inte några konflikter att zooma till" -#: ../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 "Slå ihop sträckor" -#: ../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 "Förena flera sträckor till en enda." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 +msgid "Combine ways with different memberships?" +msgstr "Slå ihop sträckor med olika roller?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +msgid "Combine Anyway" +msgstr "Slå ihop i alla fall" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 +msgid "" +"The selected ways have differing relation memberships. Do you still want to " +"combine them?" +msgstr "" +"De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgid "Change directions?" +msgstr "Ändra riktning?" + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +msgid "Reverse and Combine" +msgstr "Byt riktning och slå ihop" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på " +"några av dem?" + +#: ../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 "" +"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av " +"noder av dem)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Slå ihop {0} sträckor" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 msgid "Please select at least two ways to combine." msgstr "Välj åtminstone två sträckor att slå ihop" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 -msgid "Combine ways with different memberships?" -msgstr "Slå ihop sträckor med olika roller?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -msgid "Combine Anyway" -msgstr "Slå ihop i alla fall" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 -msgid "Change directions?" -msgstr "Ändra riktning?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -msgid "Reverse and Combine" -msgstr "Byt riktning och slå ihop" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Sträckorna kan inte slås ihop med bibehållen riktning. Vill du vända på " -"några av dem?" - -#: ../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 "Ange värden för alla konflikter" - -#: ../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 "Jämka konflikter" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Slå ihop {0} sträckor" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Alla sträckor var tomma" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 -msgid "" -"Could not combine ways (They could not be merged into a single string of " -"nodes)" -msgstr "" -"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av " -"noder av dem)" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -742,5 +728,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "Noderna är inte i en cirkel. Avbryter." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -769,5 +755,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 "Ta bort" @@ -777,15 +763,15 @@ msgstr "Ta bort valda objekt." -#: ../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 "Skriv över" -#: ../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 "Filen existerar redan. Vill du skriva över?" @@ -814,10 +800,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}" @@ -834,13 +820,14 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." -msgstr "" +msgstr "Laddar ner referenser från OSM..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" msgstr "" +"Laddar ner de primitiva som refererar till en av dem markerade primitiva" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." -msgstr "" +msgstr "Laddar ner referenser..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122 @@ -848,5 +835,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 @@ -856,5 +843,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" -msgstr "" +msgstr "Konflikter under nerladdningen" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 @@ -889,7 +876,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Alla bilder" +msgstr "Alla format" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -923,5 +909,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "Exportera till GPX fil" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 @@ -1020,1066 +1006,31 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Sammanfoga lagren" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge the current layer into another layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +msgstr "Sammafoga det nuvarande lagret med ett annat" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 msgid "Merge Nodes" msgstr "Slå ihop noder" -#: ../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 "Slå ihop noder med den äldsta." -#: ../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 "Välj åtminstone två noder att slå ihop." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Slå ihop noder med olika medlemskap?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Slå ihop i alla fall" - -#: ../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 "" -"De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Det går inte att slå ihop noderna: En väg som fortfarande används skulle " -"behöva tas bort." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Slå ihop {0} noder" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "Spegel" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Spegla markerade noder och sträckor." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Markera minst en nod eller sträcka." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "upp" - -#: ../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 "Flytta objekt {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "ned" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "vänster" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "höger" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Flytta {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Flytta objekt {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 "Kan inte flytta objekt utanför världen." - -#: ../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 "Ny" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Skapa ny karta" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Öppna..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Öppna en fil." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Öppna en fil." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "Okänd roll ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Öppna plats..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Öppna en URL." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Skilda lager" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Ange URL att hämta:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Hämta plats" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Hämta URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Räta upp form" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Enbart två noder kan vara valda" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Urvalet måste bestå uteslutande av sträckor." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." - -#: ../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 "Enbart en nod vald" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Räta upp" - -#: ../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 "Klistra in" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Klistra in innehållet i inklistringsbuffern" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Klistra in taggar" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Sätt taggarna som finns på innehållet i inklistringbuffern på alla valda " -"föremål." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Hämtar {0}" -msgstr[1] "Hämtar {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Ångra radering av {0} primitiv" -msgstr[1] "Ångra radering av {0} primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Inställningar..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Öppna en inställningssida för globala inställningar." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Inställningar" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Återställ" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Gör om den senaste ogjorda handlingen." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Byt namn på lager" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Byt också namn på filen" - -#: ../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 "Ändra riktning på sträckor" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Ändra riktningen på alla valda sträckor." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Välj åtminstone en sträcka." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Ändra riktning på sträckor" - -#: ../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 "Spara" - -#: ../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 "Spara nuvarande data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Fil {0} existerar redan. Skriv över?" - -#: ../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 "Tomt dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokumentet innehåller inte någon data." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Spara i alla fall" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konflikter" - -#: ../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 "" -"Det finns olösta konflikter. Konflikter sparas inte och kommer att behandlas " -"som om du avvisat dem alla. Fortsätt?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Avvisa konflikter och spara" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Spara OSM-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Spara GPX-fil" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Spara Lager" - -#: ../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 "Spara som..." - -#: ../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 "Spara nuvarande data i en ny fil." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Välj allt" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Välj alla icke borttagna objekt i datalagret. Detta väljer även ut " -"ofullständiga objekt." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Visa statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" -"Visa statusrapport med information som kan vara av nytta vid felrapportering." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Hjälp: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Statusrapport" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopiera till urklipp och stäng" - -#: ../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 "Stäng" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Dela sträcka" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Dela sträckan vid vald nod." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Det går inte att dela baserat på nuvarande urval." - -#: ../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] "Den valda noden ligger inte inuti någon sträcka." -msgstr[1] "De valda noderna ligger inte inuti någon sträcka." - -#: ../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] "" -"Det finns mer än en sträcka som använder sig av den nod du valt. Välj även " -"sträckan." -msgstr[1] "" -"Det finns mer än en sträcka som använder sig av de noder du valt. Välj även " -"sträckan." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "De valda noderna ingår inte i samma sträcka." - -#: ../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] "Den valda sträckan innehåller inte den valda noden." -msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna." - -#: ../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 "Du måste välja två eller fler noder för att dela en sluten sträcka." - -#: ../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 "" -"Sträckan kan inte delas vid de valda noderna. (Tips: Välj noder mitt på " -"sträckan.)" - -#: ../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 "Dela sträcka {0} i {1} delar" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Stänger ändringssamling..." - -#: ../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 "Stänger ändringssamling..." - -#: ../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 "Öppnar ändringssamling..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Stänger ändringssamling..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Alternera gpx-linjer" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Rita linjer mellan råa gps-punkter." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Byter läge för den globala inställningen ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Frigör sträckor" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Duplicera noder som används av flera olika sträckor." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Denna nod är inte bunden till något annat." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ingen av dessa noder hänger ihop med någonting annat." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ingen av noderna på denna sträcka är knuten till något annat." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Det nuvarande urvalet kan inte användas för att frigöra något." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Välj antingen:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* En nod med tagg, eller" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* En nod som används av mer än en sträcka, eller" - -#: ../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 "" -"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" - -#: ../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 "" -"* En sträcka som har en eller flera noder som används av mer än en sträcka, " -"eller" - -#: ../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 "" -"* En sträcka och en eller flera av dess noder som används av mer än en " -"sträcka." - -#: ../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 "" -"OBS: Om en sträcka är vald, så kommer denna sträcka att få ny kopior av de " -"frigjorda\n" -"noderna och dessa nya noder som att vara valda. Annars så kommer alla " -"sträckor att\n" -"få sina egna kopior och alla noder kommer att vara valda." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Frigjord nod" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Duplicera till {0} noder" - -#. 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 "Duplicera {0} noder till {1} noder" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Ångra" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Ångra senaste åtgärden." - -#: ../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 "Avmarkera alla" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Avmarkera alla objekt." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Avmarkera allt (fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Avmarkera allt (Escape)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Uppdatera data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)" - -#. 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 "" - -#: ../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 "Uppdatera markering" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Uppdatera markerade primitiv från servern" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Det finns inga markerade primitiv att uppdatera." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Tom markering" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Skicka in till OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Skicka in alla ändringar till OSM-servern." - -#: ../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 "Det finns olösta konflikter. Du måste lösa dessa först." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Det finns inte några ändringar att skicka in." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Synkronisera enbart {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 "Synkronisera hela datasetet" - -#: ../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 "Konflikt upptäkt" - -#. 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 "oförväntat returvärde. Erhöll {0}" - -#: ../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 "" -"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " -"{0} för att synkronisera all lokal data med servern." -"
Klicka på {1} för att avbryta och fortsätta redigera." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" -"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\"" - -#: ../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 "Uppladdning misslyckades.
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Uppladningen till OSM API misslyckades" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Uppdaterar primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Skicka in dessa ändringar?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Skicka in ändringar" - -#: ../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 "Lägg till en ny nod i en befintlig sträcka" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ge en kort kommentar till de ändringar som du skickar in:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Kartinställningar" - -#: ../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 "Nya objekt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Ändrade objekt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Borttagna objekt:" - -#: ../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] "Nya objekt:" -msgstr[1] "Nya objekt:" - -#: ../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] "Ändrade objekt:" -msgstr[1] "Ändrade objekt:" - -#: ../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] "Borttagna objekt:" -msgstr[1] "Borttagna objekt:" - -#: ../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 "Senast ändrad {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Zooma in" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zooma ut" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Tillbaka" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Hoppa tillbaka." - -#: ../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 "Ljud: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Snabbare" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Snabbare framåt" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Framåt" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Hoppa framåt" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Nästa markering" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Spela upp nästa markering" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Spela/pausa" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Spela/pausa ljud." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Föregående markering" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Spela upp föregående markering" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Långsammare" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Långsammare framåt" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "Hämtar GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Hämtade GPX-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Rå GPS-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Hämtar data" - -#: ../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 "Ingen data importerad." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap-data" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Laddar ner {0} av {1} ({2} kvar)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Fel under nedladdning" - -#: ../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 "" -"Det finns {0} primitiver i din data som kanske
är borttagna från " -"servern. Om du senare försöker ta bort eller
uppdatera de från servern " -"kommer det troligtvis leda till
en konflikt.

Klicka på {1}" -" för att kontrollera statusen på dessa primitiv
på servern." -"
Klicka på {2} för att ignorera.
" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Raderade eller flyttade primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Borttagningsläge" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Ta bort noder eller sträckor" - -#: ../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 "Läge: {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 "" -"Klicka för att ta bort. Skift: ta bort delsträcka. Alt: lämna kvar oanvända " -"noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" - +#: ../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 @@ -2090,7 +1041,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 @@ -2099,6 +1051,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 @@ -2129,4 +1081,908 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Det går inte att slå ihop noderna: En väg som fortfarande används skulle " +"behöva tas bort." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Slå ihop {0} noder" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Sammanfoga markeringen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Sammanfoga de markerade primitiva med ett annat lager" + +#: ../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 "Spegel" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Spegla markerade noder och sträckor." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Markera minst en nod eller sträcka." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "upp" + +#: ../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 "Flytta objekt {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "ned" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "vänster" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "höger" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Flytta {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Flytta objekt {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 "Kan inte flytta objekt utanför världen." + +#: ../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 "Ny" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Skapa ny karta" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Öppna..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Öppna en fil." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "Öppnar filer" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Öppnar fil ''{0}'' ..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Öppna plats..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Öppna en URL." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Skilda lager" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Ange URL att hämta:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Hämta plats" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Hämta URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Räta upp form" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Enbart två noder kan vara valda" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Urvalet måste bestå uteslutande av sträckor." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." + +#: ../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 "" +"Du använder EPSG:4326 projektionen som kan leda
till icke önskvärd " +"resultat vid rektangulära alignments.
Ändra projektionen för att få bort " +"denna varning.
Vill du fortsätta?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Enbart en nod vald" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Räta upp" + +#: ../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 "Klistra in" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Klistra in innehållet i inklistringsbuffern" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Klistra in taggar" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Sätt taggarna som finns på innehållet i inklistringbuffern på alla valda " +"föremål." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Klistrar in {0} tag" +msgstr[1] "Klistrar in {0} tagar" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "till {0} primitiva" +msgstr[1] "till {0} primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Inställningar..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Öppna en inställningssida för globala inställningar." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Inställningar" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Återställ" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Gör om den senaste ogjorda handlingen." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Byt namn på lager" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Byt också namn på filen" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "Kunde inte döpa om filen ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Ändra riktning på sträckor" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Ändra riktningen på alla valda sträckor." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Välj åtminstone en sträcka." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Ändra riktning på sträckor" + +#: ../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 "Spara" + +#: ../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 "Spara nuvarande data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Fil {0} existerar redan. Skriv över?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "Hittade ingen exportör! Sparede ingenting." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Tomt dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Spara i alla fall" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokumentet innehåller inte någon data." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Avvisa konflikter och spara" + +#: ../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 "" +"Det finns olösta konflikter. Konflikter sparas inte och kommer att behandlas " +"som om du avvisat dem alla. Fortsätt?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Spara OSM-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Spara GPX-fil" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Spara Lager" + +#: ../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 "Spara som..." + +#: ../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 "Spara nuvarande data i en ny fil." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Välj allt" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Välj alla icke borttagna objekt i datalagret. Detta väljer även ut " +"ofullständiga objekt." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Visa statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" +"Visa statusrapport med information som kan vara av nytta vid felrapportering." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Hjälp: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Statusrapport" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopiera till urklipp och stäng" + +#: ../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 "Stäng" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Dela sträcka" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Dela sträckan vid vald nod." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Det går inte att dela baserat på nuvarande urval." + +#: ../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] "Den valda noden ligger inte inuti någon sträcka." +msgstr[1] "De valda noderna ligger inte inuti någon sträcka." + +#: ../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] "" +"Det finns mer än en sträcka som använder sig av den nod du valt. Välj även " +"sträckan." +msgstr[1] "" +"Det finns mer än en sträcka som använder sig av de noder du valt. Välj även " +"sträckan." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "De valda noderna ingår inte i samma sträcka." + +#: ../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] "Den valda sträckan innehåller inte den valda noden." +msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna." + +#: ../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 "Du måste välja två eller fler noder för att dela en sluten sträcka." + +#: ../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 "" +"Sträckan kan inte delas vid de valda noderna. (Tips: Välj noder mitt på " +"sträckan.)" + +#: ../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 "Dela sträcka {0} i {1} delar" + +#: ../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 "Alternera gpx-linjer" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Rita linjer mellan råa gps-punkter." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Byter läge för den globala inställningen ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Frigör sträckor" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Duplicera noder som används av flera olika sträckor." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Denna nod är inte bunden till något annat." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ingen av dessa noder hänger ihop med någonting annat." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ingen av noderna på denna sträcka är knuten till något annat." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Det nuvarande urvalet kan inte användas för att frigöra något." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Välj antingen:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* En nod med tagg, eller" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* En nod som används av mer än en sträcka, eller" + +#: ../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 "" +"* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" + +#: ../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 "" +"* En sträcka som har en eller flera noder som används av mer än en sträcka, " +"eller" + +#: ../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 "" +"* En sträcka och en eller flera av dess noder som används av mer än en " +"sträcka." + +#: ../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 "" +"OBS: Om en sträcka är vald, så kommer denna sträcka att få ny kopior av de " +"frigjorda\n" +"noderna och dessa nya noder som att vara valda. Annars så kommer alla " +"sträckor att\n" +"få sina egna kopior och alla noder kommer att vara valda." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Frigjord nod" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Duplicera till {0} noder" + +#. 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 "Duplicera {0} noder till {1} noder" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Ångra" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Ångra senaste åtgärden." + +#: ../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 "Avmarkera alla" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Avmarkera alla objekt." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Avmarkera allt (fokus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Avmarkera allt (Escape)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Uppdatera data" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)" + +#. 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 "Laddar up data" + +#: ../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 "Uppdatera markering" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Uppdatera markerade primitiv från servern" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Det finns inga markerade primitiv att uppdatera." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Tom markering" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Skicka in till OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Skicka in alla ändringar till OSM-servern." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "Konflikter i lager ''{0}''.
Du måste lösa dem först." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Det finns inte några ändringar att skicka in." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Synkronisera enbart {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 "Synkronisera hela datasetet" + +#: ../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 "Konflikt upptäkt" + +#. 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 "oförväntat returvärde. Erhöll {0}" + +#: ../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 "" +"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " +"{0} för att synkronisera all lokal data med servern." +"
Klicka på {1} för att avbryta och fortsätta redigera." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" +"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\"" + +#: ../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 "Uppladdning misslyckades.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Uppladningen till OSM API misslyckades" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Uppdaterar primitiv" + +#: ../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 "Zooma in" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zooma ut" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Tillbaka" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Hoppa tillbaka." + +#: ../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 "Ljud: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Snabbare" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Snabbare framåt" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Framåt" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Hoppa framåt" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Nästa markering" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Spela upp nästa markering" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Spela/pausa" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Spela/pausa ljud." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Föregående markering" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Spela upp föregående markering" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Långsammare" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Långsammare framåt" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "Hämtar GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Hämtade GPX-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Rå GPS-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Hämtar data" + +#: ../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 "Ingen data importerad." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap-data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Laddar ner {0} av {1} ({2} kvar)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Fel under nedladdning" + +#: ../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 "" +"Det finns {0} primitiver i din data som kanske
är borttagna från " +"servern. Om du senare försöker ta bort eller
uppdatera de från servern " +"kommer det troligtvis leda till
en konflikt.

Klicka på {1}" +" för att kontrollera statusen på dessa primitiv
på servern." +"
Klicka på {2} för att ignorera.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Raderade eller flyttade primitiv" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Borttagningsläge" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Ta bort noder eller sträckor" + +#: ../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 "Läge: {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 "" +"Klicka för att ta bort. Skift: ta bort delsträcka. Alt: lämna kvar oanvända " +"noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2241,18 +2097,18 @@ "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." -#: ../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 "Markera" -#: ../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 "Välj, flytta och rotera objekt." -#: ../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" @@ -2261,18 +2117,18 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "Flytta element" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Flytta" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "Ångra flytt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#, java-format msgid "" "You moved more than {0} elements. Moving a large number of elements is often " @@ -2280,9 +2136,6 @@ "Really move them?" msgstr "" -"Du flyttade mer än {0} element. Flytt av ett stort antal element är ofta ett " -"fel.\n" -"Vill du verkligen flytta på dem?" - -#: ../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 "" @@ -2409,7 +2262,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id:... - objektet med angiven ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2462,41 +2314,41 @@ msgstr "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Påbörja sökning" -#: ../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 "Inga sökträffar för ''{0}''" -#: ../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 "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../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 "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../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 "{0} sökträffar" -#: ../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 "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2510,40 +2362,40 @@ "{2}" -#: ../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 "" -#: ../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 "Det saknas argument för eller (or)." -#: ../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 "Det saknas argument för inte (not)." -#: ../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 "En avslutande parentes förväntades" -#: ../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 "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2552,5 +2404,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." @@ -2587,62 +2439,62 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Lägg till nod" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#, fuzzy, java-format +#, java-format msgid "Add way {0}" -msgstr "Lägg till {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Relationer: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Ändra {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Ändra {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Ändra relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Ta bort \"{0}\" för {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Ta bort \"{0}\" för {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Ta bort \"{0}\" för {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Sätt {0}={1} för {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Sätt {0}={1} för {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Sätt {0}={1} för {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2714,30 +2566,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] "Ta bort {0} {1}" -msgstr[1] "Ta bort {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] "Borttagningsläge" -msgstr[1] "Borttagningsläge" +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] "Ta bort {0} {1}" -msgstr[1] "Ta bort {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] "Ta bort från relation" -msgstr[1] "Ta bort från relation" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2751,20 +2603,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n" -"Ta bort från relationen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Urvalet \"{0}\" ingår i relationen \"{1}\"\n" -"Ta bort från relationen?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2775,5 +2623,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." @@ -2854,17 +2702,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Lös {0} taggninskonfliker i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Lös {0} taggninskonfliker i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Lös {0} taggninskonfliker i {1} {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2874,17 +2722,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Lös versionskonfliker för {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Lös versionskonfliker för {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Lös versionskonfliker för {0} {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -3022,9 +2870,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3091,5 +2939,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 @@ -3097,23 +2945,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 "parameter {0} > 0 krävs. Erhöll {1}." -#: ../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 "parametern ''{0}'' får inte vara null" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Fel: {0}" -#: ../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 "Varning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "oförväntat returvärde. Erhöll {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "oförväntat returvärde. Erhöll {0}" + +#: ../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 @@ -3126,11 +2999,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 "" @@ -3181,9 +3059,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 "En sträcka för en yta är inte sluten." -#: ../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." @@ -3192,118 +3070,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 "Tom medlem i relationen." -#: ../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 "Tog bort medlemmen ''{0}'' i relationen." -#: ../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 "Sträcka \"{0} med mindre än två punkter." -#: ../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 "Det finns mer än en \"från\"-sträcka." -#: ../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 "Det finns mer än en \"till\"-sträcka." -#: ../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 "Mer än en \"via\" hittades." -#: ../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 "Okänd roll ''{0}''." -#: ../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 "Okänd medlemstyp för ''{0}''." -#: ../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 "Det finns inte någon \"från\"-sträcka." -#: ../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 "Det finns inte någon \"till\"-sträcka." -#: ../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 "Ingen nod eller sträcka för \"via\" hittades." -#: ../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 "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." -#: ../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 "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." -#: ../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 "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." -#: ../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 "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." -#: ../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 "Stil för restriktion {0} kunde inte hittas." -#: ../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 "Ingen användbar roll ''{0}'' för sträckan ''{1}''." -#: ../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 "Icke-sträcka ''{0}'' i multipolygon." -#: ../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 "Multipolygonen ''{0}'' saknar yttre sträcka." -#: ../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 "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." -#: ../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 "Den inre sträckan ''{0}'' befinner sig utanför." -#: ../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 "Stil för inre väg ''{0}'' är samma som multipolygonen." -#: ../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 "Stil för yttre väg ''{0}'' passar inte." -#: ../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 "otaggade" -#: ../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 "text" @@ -3326,5 +3204,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" @@ -3335,5 +3213,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" @@ -3344,5 +3222,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" @@ -3456,5 +3334,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "järnväg" @@ -3486,136 +3364,34 @@ msgstr[1] "{0} medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"Kunde inte upprätta anslutning till OSM servern {0}.\n" -"Kontrollera din internetanslutning och att serverns URL är korrekt i dina " -"inställningar." - -#. 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 "okänd" - -#: ../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 "" -"Uppladdning till servern misslyckades eftersom " -"dina
nuvarande data bryter mot ett förhandsvillkor.
Felmeddelandet " -"är:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Brott mot förhandsvillkor" +#: ../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 +#, fuzzy +msgid "Bad Request" +msgstr "Redigera rackets" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Okänd värddator" -#: ../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 "" -"Uppladdning misslyckades eftersom en primitiv du " -"försökte
ta bort från servern redan är borttagen.

Felmeddelandet " -"är:
{0}" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitiv redan raderad" @@ -3834,5 +3610,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}" @@ -4209,4 +3985,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 @@ -4278,8 +4056,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 @@ -4404,5 +4182,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 "raderad" @@ -4462,5 +4240,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 "" @@ -4502,4 +4280,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 @@ -4513,5 +4292,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 "" @@ -4617,4 +4396,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 "Det finns inte några konflikter att zooma till" + +#: ../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 @@ -4627,24 +4442,23 @@ msgstr "alla" -#: ../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 "Välj en färg" - -#: ../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}''" @@ -4652,12 +4466,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parametern ''{0}'' får inte vara null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4665,14 +4479,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 "Inte implementerat ännu." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4681,17 +4496,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "från sträcka" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Ta bort från relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Datakonflikter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4715,24 +4527,8 @@ msgstr[1] "{0} relationer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Ändra upplösning" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Jämka konflikter" - -#: ../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 "Klistra in" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4747,9 +4543,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} sträcka" -msgstr[1] "{0} sträckor" +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 "Ta bort medlemmen på den nuvarande tabellraden från denna relation" + +#: ../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 "plats" + +#: ../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 "Tangent:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Värde" + +#: ../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 "Enkelriktat" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Utgåva" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4776,5 +4637,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}" @@ -4806,5 +4667,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." @@ -4877,13 +4738,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 "Lager: {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 "Relationer: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4969,5 +4830,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 "" @@ -5026,5 +4887,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 "Lägg till" @@ -5074,5 +4935,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 "Relationer" @@ -5167,9 +5028,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] "Upphovsman" -msgstr[1] "Upphovsman" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5182,15 +5043,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Mer information om denna funktion" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, fuzzy, java-format +#, java-format msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade " -"primitiven." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5265,5 +5123,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}" @@ -5281,9 +5139,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 "" @@ -5534,11 +5387,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 "" @@ -5552,7 +5405,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Hämtar tidiga insticksmoduler" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5678,5 +5530,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Platser" @@ -5754,9 +5606,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger musknapp " +"och flytta musen. Välj: Klicka" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5796,7 +5651,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "raderar referens från relation {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5805,7 +5660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Skicka in inställningar till servern" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5853,7 +5707,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 -#, fuzzy, java-format +#, java-format msgid "Loading history for relation {0}" -msgstr "raderar referens från relation {0}" +msgstr "" #. item "Streets/Motorway" text "Reference" @@ -6688,52 +6542,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 "Namn" @@ -6743,21 +6597,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 "Ändra relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Mer information om denna funktion" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Senast ändrad {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6775,7 +6627,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Gatunamn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6816,12 +6667,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Välj ett värde" +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 "parametern ''{0}'' får inte vara null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6866,5 +6716,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "Korrigera taggkonflikter" @@ -6882,5 +6732,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 "" @@ -6899,5 +6749,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6911,7 +6761,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Kassera och avsluta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6924,7 +6773,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Spara och avsluta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -7002,7 +6850,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Vid inskickning" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -7011,17 +6858,145 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Ge en kort kommentar till de ändringar som du skickar in:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216 +msgid "Settings" +msgstr "Inställningar" + +#: ../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 "Nya objekt:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Ändrade objekt:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Borttagna objekt:" + +#: ../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 "Skicka in ändringar" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Arkiv" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Skicka in dessa ändringar?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Ladda Upp" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Ange platsens namn." + +#: ../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 "Det finns inga markerade primitiv att uppdatera." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7254,5 +7229,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." @@ -7310,7 +7284,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Hämtar data" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7375,4 +7348,13 @@ msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" + +#: ../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 "" +"Det anses skadligt att skicka in obehandlad GPS-data.
Om du vill " +"skicka in spår, se här:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7564,5 +7546,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 "Välj vilken rad du vill ta bort." @@ -8039,7 +8021,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Visa objektens ID i urvalslistor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -8054,7 +8035,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Visa objektens ID i urvalslistor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8435,8 +8415,4 @@ msgstr "Avaktivera" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Tangent:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8493,5 +8469,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 @@ -8502,42 +8478,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Lägg till ett nytt lager" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Ta bort valt lager." - -#: ../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 "Mer information om denna funktion" #. 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 "Valfria attribut:" -#: ../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 "Använd snabbvalet ''{0}'' i gruppen ''{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 "Använd snabbval ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "slutenväg" -#: ../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 "Okänd typ: {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 @@ -8548,15 +8522,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {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 "Fel vid tolkning {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 "Objekt av typ {0} stöds." -#: ../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 @@ -8566,18 +8540,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../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 "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -8604,5 +8578,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, Det saknas förmodligen några taggar." @@ -8618,7 +8591,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 @@ -8696,5 +8666,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}" @@ -8702,5 +8672,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" @@ -8708,5 +8678,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" @@ -8727,6 +8696,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 @@ -8736,40 +8705,40 @@ msgstr "Hämtar OSM-data..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "Urvalet utökades inte genom att söka efter ''{0}''" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8831,10 +8800,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 "" @@ -8842,11 +8811,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 "Öppnar ändringssamling..." - -#: ../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}" @@ -8854,34 +8821,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 "Öppnar ändringssamling..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Öppnar ändringssamling..." - -#: ../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 "Öppnar ändringssamling..." - -#: ../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 " @@ -8889,44 +8840,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../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 "Stänger ändringssamling..." - -#: ../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 "Öppnar ändringssamling..." - -#: ../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 "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Skickar in..." -#: ../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}." @@ -8945,10 +8896,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 "" @@ -9007,6 +8958,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 serverfiler" @@ -9035,5 +8991,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 "" @@ -9090,74 +9046,139 @@ msgstr "Fel vid tolkning." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Okänd version" - -#: ../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 "Det nödvändiga attributet \"{0}\" saknas." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "jämkad version:" + +#: ../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 "Hittade element av typen på icke-sträcka" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " har nollreferens" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Fann -tagg utanför relation." - -#: ../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 "Ofullständig -specifikation med 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 "Ogiltigt objekt med 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 "Det nödvändiga attributet \"{0}\" saknas." #: ../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 "" @@ -9166,16 +9187,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 +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Förbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Felformaterad nod-id" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Förbereder OSM-data..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Förbereder data..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9221,33 +9256,43 @@ "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning." -#: ../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} kvar. Skickar in {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} kvar. Skickar in {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} kvar. Skickar in {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 "Skickar in..." + +#: ../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 "Det finns inte någonting att skicka in. Skaffa lite data först." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9286,11 +9331,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 "" @@ -9303,4 +9343,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 @@ -9344,11 +9389,15 @@ #: ../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 "Avaktivera insticksmodul" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "Behåll plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -9357,9 +9406,5 @@ "inställningarna?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "Behåll plugin" - -#: ../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 " @@ -9369,5 +9414,9 @@ "JOSM har behörighet att skriva över de existerande." -#: ../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 "" @@ -9376,10 +9425,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''." -#: ../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 "Enligt information inifrån insticksmodulen är dess upphovsman {0}." -#: ../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." @@ -9388,9 +9437,9 @@ "innan du rapporterar en bugg." -#: ../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 "Skall insticksmodulen avaktiveras?" -#: ../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 " @@ -9400,13 +9449,13 @@ "frigöra insticksmodulen." -#: ../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" @@ -9463,4 +9512,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 "okänd" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9536,4 +9616,94 @@ msgstr "(Texten finns redan i urklipp.)" +#: ../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 "" +"Uppladdning till servern misslyckades eftersom " +"dina
nuvarande data bryter mot ett förhandsvillkor.
Felmeddelandet " +"är:
{0}" + +#: ../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 "" +"Uppladdning misslyckades eftersom en primitiv du " +"försökte
ta bort från servern redan är borttagen.

Felmeddelandet " +"är:
{0}" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9605,5 +9775,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9612,5 +9782,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9619,5 +9789,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9626,5 +9796,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9633,5 +9803,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9690,40 +9860,39 @@ msgstr "Skicka in spår" -#: ../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 "Beskrivning" -#: ../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 "Ange beskrivning för ditt spår." -#: ../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}" @@ -9731,47 +9900,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 "Ansluter..." -#: ../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 "Inskickning avbruten" -#: ../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 "Fel vid inskickning" -#: ../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 "GPX-inskickning genomförd" -#: ../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 "Inskickning misslyckades. Servern returnerade följande meddelande: " -#: ../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 "Skickar in GPX-spår: {0}% ({1} av {2})" -#: ../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 "Ingen beskrivning angiven. Skriv in en beskrivning." -#: ../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 "Inget GPX-lager valt. Kan inte skicka in ett spår." -#: ../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 "Inget användarnamn angivet." -#: ../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 "Inget lösenord angviet." -#: ../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 "Skickar in GPX-spår" @@ -9991,5 +10160,5 @@ msgstr "Bilder som inte taggats ännu" -#: ../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 "Sätt bilder i relation till GPX-spår" @@ -10003,13 +10172,13 @@ msgstr "Auto-gissa" -#: ../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 "Välj ett GPX-spår" -#: ../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 "Inget GPX-spår har valts" -#: ../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 "" @@ -10020,9 +10189,9 @@ "Förväntat format: {0}" -#: ../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 "Ogiltig tidszon" -#: ../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 "" @@ -10033,26 +10202,26 @@ "Förväntat format: {0}" -#: ../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 "Ogiltig förskjutning" -#: ../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 "Hittade {0} träffar för {1} i GPX-spår {2}" -#: ../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 "GPX-spår har hämtats" -#: ../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 "De markerade fotografierna innehåller ingen tidsinformation." -#: ../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 "Fotografierna innehåller ingen tidsinformation." -#: ../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." @@ -10060,39 +10229,39 @@ "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733 msgid "GPX Track has no time information" msgstr "GPX-spåret saknar tidsinformation" -#: ../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 "Tidszon: {0}" -#: ../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 "Minuter: {0}" -#: ../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 "Sekunder: {0}" -#: ../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 "Parade ihop {0} av {1} foton med GPX-spåret" -#: ../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 "(Tidsdifferens om {0} dagar)" -#: ../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 "Förskjutning mellan spår och foton: {0}m {1}s" -#: ../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 " @@ -10100,13 +10269,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 "Matchning av fotografier mot spår misslyckades" -#: ../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 "Justera tidszon och tidsförskjutning" -#: ../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 "Standardinställningar" @@ -10144,5 +10313,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 "Fel vid läsning av fil" @@ -10171,11 +10340,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"Stad/ort {0} kunde inte hittas i WMS.\n" -"Kontrollera tillgängligheten via www.cadastre.gouv.fr" #. this below is a temporary workaround to fix the "always on top" issue @@ -10191,13 +10358,13 @@ msgstr "Välj en av..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../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" @@ -10206,13 +10373,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 "" @@ -10328,9 +10495,9 @@ msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "Tagg för källa har automatiskt lagts till:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "Lägg \"source=...\" till objekt?" @@ -10483,7 +10650,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Markera" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10567,5 +10733,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 "Tomt lager" @@ -11509,18 +11675,18 @@ msgstr "Okänd status för problemfall" -#: ../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 "Öppna det som syns..." -#: ../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 "Öppna enbart filer som är synliga i nuvarande visningsläge." -#: ../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 "Ingenting visas - kan inte fastställa gränser!" -#: ../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}" @@ -11531,5 +11697,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11539,9 +11705,9 @@ "kartinställningssidan av inställningar." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "inställningar för osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox-applikationen" @@ -11552,28 +11718,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Skapa ny nod" + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "ändra urval" -#: ../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 "ändra vad som visas" -#: ../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 "bekräfta alla fjärrstyrda handlingar manuellt" -#: ../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 "En insticksmodul som låter JOSM kontrolleras från andra applikationer." -#: ../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 "Fjärrstyrning" -#: ../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 "Inställningar för insticksmodulen Fjärrstyrning" -#: ../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 " @@ -11585,28 +11756,35 @@ "applikationer i kommunikation med insticksmodulen." -#: ../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 "Tillåtna handlingar" -#: ../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 "Fjärrstyrning har begärts för att hämta data från API" -#: ../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 "Detaljer om begäran: {0}" -#: ../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 "Vill du tillåta detta?" -#: ../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 "Bekräfta fjärrstyrd handling" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "Fjärrstyrning har begärts för att hämta data från API" + +#: ../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 "Fjärrstyrning har begärts för att importera data från följande URL:" @@ -12108,25 +12286,33 @@ "att det inte har uppstått några fel." +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Ange värden för alla konflikter" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Jämka konflikter" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Korrigera taggkonflikter" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "Tog bort element från relation" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "Slå ihop områden: Ta bort korta sträckor" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "Sluten sträcka" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "Ta bort taggar från inre sträckor" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "" @@ -12202,6 +12388,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 "Valideringsfel" @@ -12211,10 +12397,10 @@ msgstr "Inga valideringsfel" -#: ../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 "Rutnät" -#: ../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 "" @@ -12305,51 +12491,65 @@ msgstr "Utför datavalidering" -#: ../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 "Data med fel. Skicka in ändå?" -#: ../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 "Öppna valideringslistan" -#: ../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 "Zooma till problem" -#: ../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 "Rätta till" -#: ../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 "Rätta till de valda felen" -#: ../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 "Ignorera" -#: ../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 "Ignorera de valda felen nästa gång." -#: ../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 "Hela gruppen" -#: ../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 "Enstaka poster" -#: ../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 "Ingenting" -#: ../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 "Ignorera hela gruppen eller enstaka poster?" -#: ../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 "Ignorerar poster" + +#: ../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 "Laddar up data" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12375,16 +12575,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Detta test kontrollerar om två vägar, järnvägar eller vattendrag korsar " -"varandra i samma lager, men inte förenas med en nod." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "Skapa byggnader" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12392,20 +12588,19 @@ msgstr "Korsande sträckor" -#: ../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 "Dubbletter av noder" -#: ../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 "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Noder med samma namn" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12413,20 +12608,16 @@ #: ../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 "Dubblera sträcka" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." msgstr "" -"Detta test kontrollerar att det inte finns några noder med precis samma läge." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Skapa en dubblett av sträcka" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13012,5 +13203,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "Undantag inträffade" @@ -13094,5 +13285,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 " @@ -13100,5 +13291,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 "" @@ -13116,17 +13307,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 "" @@ -13167,19 +13358,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "avsedd för" - -#: ../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 "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../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 "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -13190,111 +13380,122 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Ogiltigt datum" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../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 "Hämta WMS-lager från en fil" -#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Öppna ett tomt WMS-lager för att läsa in data från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "Inställningar för WMS-insticksmodulen" -#: ../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 "" "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen" -#: ../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 "Menynamn" -#: ../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 "URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Menynamn (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS-url (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Ange ett menynamn och en URL för WMS" -#: ../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 "Kopiera förval" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Överlappande ytor." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Välj åtminstone en sträcka." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "norr" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13663,5 +13864,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 "Referens" @@ -14203,7 +14404,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "Fäbod" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14224,8 +14424,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 "Uthyrning" +msgstr "" #. color heath @@ -14243,5 +14442,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 "skog" @@ -14254,7 +14454,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkeringsbiljetter" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14290,7 +14489,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "kullersten" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14301,7 +14499,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "ofullständig" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14312,7 +14509,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "gräs" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14506,4 +14702,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" @@ -14532,12 +14729,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 "ja" #. color permissive -#. +#. #. 1 #. 40000 @@ -14585,5 +14782,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14620,5 +14817,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14682,6 +14879,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 "nej" @@ -14827,6 +15025,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 "Typ" @@ -15097,7 +15295,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Gågata" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -15116,7 +15313,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Spikhinder" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15408,7 +15604,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 "Operatör" @@ -15621,6 +15817,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 "Höjd" @@ -16532,7 +16728,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" @@ -16580,23 +16773,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 "Öppettider" @@ -16620,5 +16813,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" @@ -16665,22 +16857,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 "" @@ -16695,22 +16887,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 "" @@ -16725,22 +16917,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 "" @@ -16774,5 +16966,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 "Referensnummer" @@ -16792,7 +16984,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "Markera som slutförd" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16806,7 +16997,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "Kapacitet" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16816,12 +17006,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Handikappplatser" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Handikappplatser" +msgstr "" #: build/trans_presets.java:1400 @@ -17023,5 +17211,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "VIndskydd" @@ -17406,7 +17594,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Stopp" +msgstr "" #. color tertiary @@ -17449,28 +17636,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "kinesiskt" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Hämta område" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Klistra in" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Stad" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "lokalt" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17498,7 +17680,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Bergsvandringsled" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17512,7 +17693,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "sidospår" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17529,13 +17709,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Gränskontroll" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "nybörjare" +msgstr "" #: build/trans_presets.java:1737 @@ -17552,7 +17730,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "markanvändning" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17563,19 +17740,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Information" +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 "beskrivning av gps-spår" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Ljud" +msgstr "" #. @@ -17586,7 +17760,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefonnummer" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17910,5 +18083,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17942,5 +18115,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -19066,6 +19239,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 "Religion" @@ -19074,66 +19247,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 "bahai" -#: 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 "buddism" -#: 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 "kristendom" -#: 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 "hinduism" -#: 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 "jain" -#: 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 "judendom" -#: 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 "islam" -#: 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 "" -#: 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 "daoism" -#: 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 "zoroastrianism" -#: 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 "Samfund" @@ -19142,76 +19315,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 "anglikaner" -#: 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 "baptister" -#: 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 "katoliker" -#: 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 "evangelister" -#: 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 "jehovas_vittnen" -#: 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 "luteraner (inkl. Svenska kyrkan)" -#: 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 "metodister" -#: 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 "mormoner" -#: 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 "ortodoxa" -#: 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 "pinstvänner" -#: 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 "presbytarianer" -#: 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 "protestanter" -#: 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 "kväkare" -#: 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 "shiamuslimer" -#: 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 "sunnimuslimer" @@ -19543,5 +19716,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 "Anteckning" @@ -19566,5 +19739,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 "Mynt" @@ -19572,5 +19745,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 "Anteckningar" @@ -19578,5 +19751,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 "Betalkort" @@ -19584,5 +19757,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 "Kontokort" @@ -19590,5 +19763,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 "Kreditkort" @@ -19647,10 +19820,144 @@ msgstr "Bänk" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Tillbaka" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Minnesmärke" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "inget" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "plats" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Färg" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Tillbaka" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "ned" + +#. 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 "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "slut" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Värde" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "vatten" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Antal kablar" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Jakttorn" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Redigera ett jakttorn" @@ -19659,30 +19966,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 "Höjd" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "låg" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "halv" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "full" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Dölj" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Fontän" @@ -19691,10 +19998,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Redigera en fontän" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Dricksvatten" @@ -19703,10 +20010,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Redigera dricksvattensfacilitet" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19714,35 +20021,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 "Affärer" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Stormarknad" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Redigera stormarknad" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "Fäbod" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Redigera fäbod" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Närköp" @@ -19750,9 +20055,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Redigera närköp" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19760,29 +20065,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Redigera 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 "Redigera en busshållplats" - -#: 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 "Redigera ett träd" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Automat" @@ -19790,5 +20093,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Redigera en automat" @@ -19796,88 +20099,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Varor till försäljning" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "biljetter för allmänna transportmedel" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkeringsbiljetter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "mat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "dryck" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "godis" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "foton" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "djurmat" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "tidningar" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "leksaker" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "frimärken" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefonkort" -#: 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 "kondomer" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "hundpåsar" #. 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 "Slakteri" @@ -19885,9 +20188,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Redigera slakteri" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Bageri" @@ -19895,9 +20198,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Redigera bageri" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Florist" @@ -19905,18 +20208,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Redigera florist" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19924,54 +20227,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Drycker" #. 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 "Dator" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Redigera datoraffär" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Electronik" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Redigera elektronikaffär" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "Redigera hifi-affär" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Möbler" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Redigera möbelaffär" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Trädgårdscenter" @@ -19979,9 +20282,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Redigera trädgårdscenter" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Järnvaror" @@ -19989,9 +20292,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Redigera järnaffär" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "Gör-det-själv-affär" @@ -19999,54 +20302,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "Redigera gör-det-själv-affär" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Kontorsmaterial" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Redigera pappershandel" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Hårfrisör" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Redigera hårfrisör" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Skor" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Redigera skoaffär" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Leksaker" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Redigera leksaksaffär" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Videobutik" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Redigera videobutik" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Kemtvätt" @@ -20054,9 +20357,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Redigera kemtvätt" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Tvätteri" @@ -20064,9 +20367,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Redigera tvätteri" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Friluftsliv" @@ -20074,32 +20377,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Redigera affär för friluftsliv" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Redigera sportaffär" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Redigera optiker" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Pengar" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Bank" @@ -20107,14 +20410,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Redigera bank" -#: 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 "Uttagsautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Växlingskontor" @@ -20122,5 +20425,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Redigera växlingskontor" @@ -20128,15 +20431,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Redigera uttagsautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Hälsovård" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Läkare" @@ -20144,18 +20447,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Redigera läkare" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Tandläkare" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Redigera tandläkare" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apotek" @@ -20163,5 +20466,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Redigera apotek" @@ -20169,9 +20472,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Receptutlämnande" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Sjukhus" @@ -20179,10 +20482,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Redigera sjukhus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -20191,5 +20494,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -20198,20 +20501,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefonnummer" #. 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 "Använd internationellt format, ex +12-345-67890" @@ -20219,5 +20522,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 "Veterinär" @@ -20226,55 +20529,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Redigera veterinär" #. 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 "Redigera en kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Redigera land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Delstat" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Redigera delstat" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Redigera region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Län" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Redigera län" @@ -20282,15 +20585,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Stad" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Redigera stad" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Småstad" @@ -20298,10 +20601,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Redigera småstad" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Förort" @@ -20309,25 +20612,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Redigera förort" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Mindre tätort" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Redigera mindre tätort" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Småort" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Redigera småort" @@ -20335,5 +20638,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Plats" @@ -20341,10 +20644,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Redigera plats" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ö" @@ -20352,24 +20655,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Redigera ö" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "vänster" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Redigera fäbod" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Grottöppning" @@ -20377,10 +20678,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Redigera en grottöppning" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Topp" @@ -20388,10 +20689,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Redigera topp" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Glaciär" @@ -20399,10 +20700,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Redigera en glaciär" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkan" @@ -20410,70 +20711,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Redigera en vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Gränser" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Nationella" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Redigera nationsgränser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administrativ" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Redigera administrativa gränser" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Civilrättslig" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Redigera en civilrättslig gräns" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Redigera politiska gränser" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Redigera gräns för nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Markanvändning" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Träd" @@ -20482,15 +20783,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Redigera ett träd" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botaniskt namn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Naturskog" @@ -20499,5 +20800,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Redigera naturskog" @@ -20505,17 +20806,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 "barrskog" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "lövskog" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "blandskog" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Kulturskog" @@ -20524,14 +20825,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Redigera användning av mark för skogsbruk" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Redigera naturreservat" @@ -20539,25 +20840,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Bergsluttning (med lösa stenar)" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Redigera bergssluttning (med lösa stenar)" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Buskage" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Redigera buskage" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Höglandshed" @@ -20565,10 +20866,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Redigera en höglandshed" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Hed" @@ -20576,5 +20877,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Redigera hed" @@ -20582,5 +20883,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Gårdsplan" @@ -20589,45 +20890,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Redigera markanvändning som gårdsplan" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Jordbruksmark" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Redigera användning av mark för jordbruk" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Äng" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Redigera markanvändning som äng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Redigera användning av mark för vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Kolonilotter" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Redigera användning av mark för koloniområden" @@ -20635,25 +20936,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Trädgård" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Redigera trädgård" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Gräs" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Redigera markanvändning som gräsyta" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Allmänning" @@ -20661,10 +20962,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Redigera användning av mark för allmänning" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Allmänning" @@ -20672,20 +20973,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Redigera allmänning" #. 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 "Redigera park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Fritidsområde" @@ -20693,5 +20994,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Redigera användning av mark för fritidsområde" @@ -20699,15 +21000,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Bostadsområde" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Redigera användning av mark för bostadsområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Kyrkogård" @@ -20715,9 +21016,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Redigera kyrkogård" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Begravningsplats" @@ -20725,39 +21026,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Redigera användning av mark för begravningsplats" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Detaljhandel" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Redigera användning av mark för detaljhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Affärsområde" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Redigera användning av mark för affärsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Industriområde" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Redigera användning av mark för industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Järnvägsmark" @@ -20765,15 +21066,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Redigera användning av mark för järnvägsmark" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militärt område" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Redigera användning av mark för militärt område" @@ -20781,55 +21082,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Byggnadsplats" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Redigera markanvändning som byggnadsplats" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Deponi" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Redigera användning av mark för deponi av avfall" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Stenbrott" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Redigera användning av mark för stenbrott" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Multipolygon" @@ -20839,5 +21140,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 "Redigera en multipolygon" @@ -20846,10 +21147,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "yttre segement" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "inre segment" @@ -20857,5 +21158,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20864,5 +21165,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20870,34 +21171,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Begränsning" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "ingen_vänstersväng" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "ingen_högersväng" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "inte_rakt_fram" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "ingen_u_sväng" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "enbart_högersväng" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "enbart_vänstersväng" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "enbart_rakt_fram" @@ -20906,15 +21207,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "från sträcka" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "via nod eller sträcka" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "till sträcka" @@ -20922,5 +21223,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20929,5 +21230,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20935,5 +21236,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20941,5 +21242,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -21005,5 +21306,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 @@ -21012,17 +21313,17 @@ msgstr "cykel" -#: 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 "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -21075,5 +21376,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 @@ -21082,13 +21383,13 @@ msgstr "fot" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -21102,10 +21403,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "tunnelbana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -21113,31 +21414,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -21146,30 +21447,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24322,76 +24623,4 @@ msgstr "historisk" -#. 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 "" - #. color green #. @@ -25359,164 +25588,143 @@ 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 "Alla sträckor var tomma" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Slå ihop noder med olika medlemskap?" + +#~ msgid "Merge Anyway" +#~ msgstr "Slå ihop i alla fall" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop " +#~ "dem?" + +#~ msgid "Unknown version" +#~ msgstr "Okänd version" + +#~ msgid "Found element in non-way." +#~ msgstr "Hittade element av typen på icke-sträcka" + +#~ msgid " has zero ref" +#~ msgstr " har nollreferens" + +#~ msgid "Found element in non-relation." +#~ msgstr "Fann -tagg utanför relation." + +#~ msgid "Ill-formed node id" +#~ msgstr "Felformaterad nod-id" + +#~ msgid "Move" +#~ msgstr "Flytta" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "unnamed" +#~ msgstr "namnlös" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-användarnamn (email)" + +#~ msgid "Aborting..." +#~ msgstr "Avbryter..." + +#~ msgid "Unknown file extension." +#~ msgstr "Okänd filändelse." + +#~ msgid "No document open so nothing to save." +#~ msgstr "" +#~ "Det finns inte något öppet dokument, så det finns inte något att spara." + +#~ msgid "Change" +#~ msgstr "Ändra" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Jämka {0} konflikter i {1} objekt" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Ta bort {1} {0}" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "olik" + +#~ msgid "false" +#~ msgstr "falsk" + +#~ msgid "true" +#~ msgstr "sann" + +#~ msgid "their version:" +#~ msgstr "deras version:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objekt har konflikter:" +#~ msgstr[1] "{0} objekt har konflikter:" + +#~ msgid "my version:" +#~ msgstr "min version:" + +#~ msgid "Revert" +#~ msgstr "Återgå" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Data Layer" +#~ msgstr "Datalager" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Taggar (tomt värde tar bort taggen)" + +#~ msgid "Occupied By" +#~ msgstr "Innehas av" + +#~ msgid "Add Selected" +#~ msgstr "Lägg till vald" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan inte ansluta till server." + +#~ msgid "Error parsing server response." +#~ msgstr "Fel vid inläsning av serverns svar." + +#~ msgid "There were conflicts during import." +#~ msgstr "Konflikter upptäcktes under import." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Ansluter till OSM-servern" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Användarnamn (epost) för OSM-kontot" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" #~ "Tips: Några av ändringarna härrör från inskickning av nya data till " #~ "servern." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp." - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. " -#~ "Rapportera in detta som ett fel." - -#~ msgid "No document open so nothing to save." -#~ msgstr "" -#~ "Det finns inte något öppet dokument, så det finns inte något att spara." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Ta bort {1} {0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Radera relationsmedlem {0} {1}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kan inte öppna inställningsmappen: {0}" - -#~ msgid "nodes" -#~ msgstr "noder" - -#~ msgid "ways" -#~ msgstr "vägar" - -#~ msgid "relations" -#~ msgstr "relationer" - -#~ msgid "Delete Layer" -#~ msgstr "Ta bort lager" - -#~ msgid "Authors: {0}" -#~ msgstr "Upphovsmän: {0}" - -#~ msgid "Public" -#~ msgstr "Publik" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du " -#~ "skickar in det." - -#~ msgid "Continue anyway" -#~ msgstr "Fortsätt ändå" - -#~ msgid "map" -#~ msgstr "karta" - -#~ msgid "citymap" -#~ msgstr "stadskarta" - -#~ msgid "hikingmap" -#~ msgstr "vandringskarta" - -#~ msgid "bicyclemap" -#~ msgstr "cykelkarta" - -#~ msgid "Move" -#~ msgstr "Flytta" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "unnamed" -#~ msgstr "namnlös" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-användarnamn (email)" - -#~ msgid "Aborting..." -#~ msgstr "Avbryter..." - -#~ msgid "Unknown file extension." -#~ msgstr "Okänd filändelse." - -#~ msgid "Change" -#~ msgstr "Ändra" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Jämka {0} konflikter i {1} objekt" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "olik" - -#~ msgid "false" -#~ msgstr "falsk" - -#~ msgid "true" -#~ msgstr "sann" - -#~ msgid "their version:" -#~ msgstr "deras version:" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objekt har konflikter:" -#~ msgstr[1] "{0} objekt har konflikter:" - -#~ msgid "my version:" -#~ msgstr "min version:" - -#~ msgid "resolved version:" -#~ msgstr "jämkad version:" - -#~ msgid "Revert" -#~ msgstr "Återgå" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Data Layer" -#~ msgstr "Datalager" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Taggar (tomt värde tar bort taggen)" - -#~ msgid "Occupied By" -#~ msgstr "Innehas av" - -#~ msgid "Add Selected" -#~ msgstr "Lägg till vald" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar" - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan inte ansluta till server." - -#~ msgid "Error parsing server response." -#~ msgstr "Fel vid inläsning av serverns svar." - -#~ msgid "There were conflicts during import." -#~ msgstr "Konflikter upptäcktes under import." - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Ansluter till OSM-servern" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Användarnamn (epost) för OSM-kontot" #~ msgid "Could not download plugin: {0} from {1}" @@ -25560,14 +25768,4 @@ #~ msgstr "Navigation" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger " -#~ "musknapp och flytta musen. Välj: Klicka" - -#~ msgid "end" -#~ msgstr "slut" - #~ msgid "Commit comment" #~ msgstr "Bidragskommentar" @@ -25598,4 +25796,7 @@ #~ msgstr "Insticksmodulen finns redan" +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp." + #~ msgid "Really mark this issue as ''done''?" #~ msgstr "" @@ -25622,4 +25823,16 @@ #~ msgid "Drawbridge" #~ msgstr "Klaffbro" + +#~ msgid "hikingmap" +#~ msgstr "vandringskarta" + +#~ msgid "citymap" +#~ msgstr "stadskarta" + +#~ msgid "map" +#~ msgstr "karta" + +#~ msgid "bicyclemap" +#~ msgstr "cykelkarta" #~ msgid "" @@ -25728,4 +25941,10 @@ #~ "{0}" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Kan inte öppna inställningsmappen: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Upphovsmän: {0}" + #~ msgid "Layers: {0}" #~ msgstr "Lager: {0}" @@ -25762,9 +25981,33 @@ #~ msgstr "Ta bort det valda" +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Publik" + #~ msgid "Server does not support changesets" #~ msgstr "Servern har inte stöd för ändringssamlingar" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. " +#~ "Rapportera in detta som ett fel." + +#~ msgid "Delete Layer" +#~ msgstr "Ta bort lager" + #~ msgid "Delete and Download" #~ msgstr "Ta bort och hämta hem" + +#~ msgid "Continue anyway" +#~ msgstr "Fortsätt ändå" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du " +#~ "skickar in det." #~ msgid "sports" @@ -25897,4 +26140,13 @@ #~ msgstr "Uppdatering misslyckades" +#~ msgid "nodes" +#~ msgstr "noder" + +#~ msgid "relations" +#~ msgstr "relationer" + +#~ msgid "ways" +#~ msgstr "vägar" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare." @@ -25905,2 +26157,5 @@ #~ msgid "No data" #~ msgstr "Inga data" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Radera relationsmedlem {0} {1}" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 17594) +++ /applications/editors/josm/i18n/po/tr.po (revision 17595) @@ -10,6 +10,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-24 13:27+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 12:59+0000\n" "Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:37+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" @@ -27,5 +27,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 @@ -34,18 +34,20 @@ msgstr "Yardım" -#: ../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 "" -#: ../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 @@ -61,8 +63,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 @@ -76,6 +78,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 @@ -85,5 +87,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 @@ -103,13 +105,13 @@ #: ../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 "Hata" -#: ../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?" @@ -117,40 +119,37 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" -"Değişikleri henüz kaydedilmemiş. Boş verip devam etmek istiyor musun?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Kaydedilmemiş Değişiklikler" -#: ../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 "Kaydet ve Çık" -#: ../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 "Vazgeç ve Çık" -#: ../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 @@ -159,11 +158,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 @@ -177,20 +177,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 "İptal" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{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 @@ -207,16 +207,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 @@ -246,12 +246,14 @@ msgstr "Uyarı" -#: ../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 "hatalı dosya atlandı URL: \"{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}" @@ -341,5 +343,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 "Eklentiler" @@ -470,9 +472,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 @@ -506,6 +508,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 @@ -524,11 +526,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 "Bilgi" @@ -550,5 +552,5 @@ msgstr "En azından üç nokta seçmen lazım" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -557,10 +559,10 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -569,5 +571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -576,9 +578,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "" -#: ../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}" @@ -633,26 +635,22 @@ msgstr "Yakınlaştıracak bir çakışma yok." -#: ../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 "Yolları Birleştir" -#: ../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 "Çeşitli yolları birine birleştir." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Lütfen birleştirmek için en az iki yol seçiniz." - -#: ../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 "Farklı sınıflardaki yolları birleştir?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Ne olursa olsun: Birleştir" -#: ../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 " @@ -662,13 +660,13 @@ "istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Yönü değiştirilsin mi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Yönü değiştirip birleştir" -#: ../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 " @@ -678,30 +676,18 @@ "değiştirmek istermisiniz?" -#: ../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 "Bütün çakışmaları için yeni değerler gir." - -#: ../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 "Çakışmaları Çöz" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "{0} yol birleştir" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Bütün yollar boştu" - -#: ../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 "Yollar birleştiriledi (Tek bir yoluna konulamadı)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "{0} yol birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Lütfen birleştirmek için en az iki yol seçiniz." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -757,5 +743,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 "Sil" @@ -765,15 +751,15 @@ msgstr "Seçili Objeleri Sil." -#: ../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 "Üzerine Yaz" -#: ../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 "Dosya mevcut. Üzerine Yaz?" @@ -802,10 +788,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}" @@ -836,5 +822,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 @@ -877,7 +863,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Bütün imajlar" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1014,1029 +999,25 @@ msgstr "Varsayılan tabaka başka bir tabaka ile birleştir" -#: ../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 "Noktaları birleştir" -#: ../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 "Noktaları en eskisiyle birleştir" -#: ../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 "Birleştirmek için en azından iki nokta seçmen lazım." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Neyse Birleştir" - -#: ../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 "" -"Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor " -"musun?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "" -"Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "{0} nokta birleştiriliyor" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Seleksiyonu birleştir" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "En azından bir nokta veya bir yol seç" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "yukarı" - -#: ../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 "Objeleri taşı {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "aşağı" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "sol" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "sağ" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Taşı {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Objeleri taşı {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 "Objeleri dünya dışına taşıyamazsın." - -#: ../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 "Yeni" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Yeni harita oluştur." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Aç..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Dosya aç." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Dosya aç." - -#: ../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 "Konum Aç..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Bağlantı aç..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "farklı Tabaka" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Lokasyonu indir" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Dikdörtgen olarak şekilendir" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Sadece iki nokta olabilir" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Seçimde sadece yollar olmalı." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "" - -#: ../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 "Sadece bir nokta seçili" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Dikdörtgenleştir" - -#: ../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 "Yapıştır" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Yapıştır hafızasındaki bilgileri yapıştır." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Etiketleri Yapıştır" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "Yükleniyor {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Tercihler..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Genel ayarlar için tercihler sayfasını aç." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Tercihler" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Tekrar Yap" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Son bitmemiş komutu tekrar yap." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Takayı yeniden isimlerdir" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Dosyayıda yeniden isimlendir" - -#: ../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 "Yolları ters çevir" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Seçili yollar için yönü ters çevir." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Lütfen en az bir yol seçiniz." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Yolları ters çevir" - -#: ../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 "Kaydet" - -#: ../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 "Şimdiki bilgiyi kaydet." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../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 "Boş döküman" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Çelişkiler" - -#: ../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 "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "OSM dosyası olarak sakla" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "GPX olarak sakla" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "" - -#: ../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 "Farklı Kaydet..." - -#: ../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 "Varolan bilgileri yeni bir dosyaya kaydet." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Hepsini Seç" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Bütün silinmesi geri alınan objeleri bilgi tabakasında seç. Bu aynızamanda " -"eksik objeleride seçer" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Yolları Böl" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Seçili kavşakta yolu böl." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Yapılan seçim bölme için kullanılamaz." - -#: ../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] "Seçili kavşak herhangi bir yolun ortasında değil." - -#: ../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] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar." - -#: ../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] "Seçili yol seçili kavşakları içermiyor." - -#: ../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 "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz." - -#: ../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 "" -"Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)" - -#: ../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 "{0} Yolu {1} parçaya bölünecek" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Kapanıyor..." - -#: ../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 "Kapanıyor..." - -#: ../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 "Açılıyor..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Kapanıyor..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "GPX hatlarını sabitle" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "GPS noktaları boyunca çiz." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Genel ayarları sabitle ''{0}''." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Yolları Çıkar" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Birçok yol tarafında kullanılan kavşakları çift yap." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "Bu kavşak başka bir nesneye yapışık değil." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Kavşakların hiçbiri herhangi bir nesneye yapışık değil." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Yolların kavşakları herhangi nesneye yapışık değil." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Seçim çıkartmak için kullanılamaz." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Şunların Arasında Seçiniz:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* Birden fazla yol için kullanılan kavşak, veya" - -#: ../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 "* Birden fazla yol için veya şu yollardan biri için, veya" - -#: ../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 "" -"* Bir veya birden kavşağı olan yol, birden fazla yol tarafında " -"kullanılabilir, veya" - -#: ../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 "" -"* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." - -#: ../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 "" -"Not:Bir yol seçili ise, bu yol çıkartılmış kavşaklardan yeni bir kopya\n" -"oluşturur ve yeni kavşaklar seçilir. Aksi halde, bütün yollar kendi " -"kopyalarını oluşturur ve bütün kavşaklar seçilir" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "{0} kavşak değiştirildi" - -#. 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 "{0} kavşalarını {1} kavşakları üzerine getir" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Geri AL(undo)" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Son komutu geri al." - -#: ../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 "Seçimleri Kaldır" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Objelerdeki seçimi kaldır." - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Seçimleri Kaldır (Odak)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Seçimleri Kaldır (Kaçış)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "" - -#. 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 "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "OSM ye yükle..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Bütün değişiklikleri OSM server'ına yükle." - -#: ../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 "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Yüklenilecek değişiklik yok." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "" - -#: ../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 "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Değişiklikleri yükle?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "" - -#: ../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 "Varolan yola kavaşka ekle" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Harita Ayarları" - -#: ../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 "Eklenilecek objeler:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Düzenlenecek objeler:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Silinecek objeler:" - -#: ../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] "Eklenilecek objeler:" - -#: ../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] "Düzenlenecek objeler:" - -#: ../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] "Silinecek objeler:" - -#: ../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 "Son değişiklik: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "İçeri Yakınlaştır" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Zoom Out" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Geri" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Geri Atla." - -#: ../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 "Ses: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Hızlı" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Hızlı İleri" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "İleri" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "İleri atla" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Diğer İmleç" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Diğer imleci oynat." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Oynat/Dondur" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Oynat/Dondur ses." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Önceki İmleç" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Önceki imleci oynat." - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Yavaş" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Yavaş İleri Götür" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "GPS verisi indiriliyor" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Ham GPS verisi" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Bilgi İndiriliyor" - -#: ../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 "İçeri bilgi alınamadı." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap verisi" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Silme Modu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Kavşak veya yolları sil." - -#: ../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 "Mode: {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 "" -"Silmek için tıklayınız. Shift: yol segmentini siler. Alt: kullnılmayan " -"kavşakları silmebir yol silerken. Ctrl:referans objelerini sil" - +#: ../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 @@ -2047,7 +1028,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 @@ -2056,6 +1038,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 @@ -2086,4 +1068,878 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "" +"Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "{0} nokta birleştiriliyor" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Seleksiyonu birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "En azından bir nokta veya bir yol seç" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "yukarı" + +#: ../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 "Objeleri taşı {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "aşağı" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "sol" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "sağ" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Taşı {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Objeleri taşı {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 "Objeleri dünya dışına taşıyamazsın." + +#: ../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 "Yeni" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Yeni harita oluştur." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Aç..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Dosya aç." + +#: ../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 "Konum Aç..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Bağlantı aç..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "farklı Tabaka" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Lokasyonu indir" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Dikdörtgen olarak şekilendir" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Sadece iki nokta olabilir" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Seçimde sadece yollar olmalı." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "" + +#: ../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 "Sadece bir nokta seçili" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Dikdörtgenleştir" + +#: ../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 "Yapıştır" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Yapıştır hafızasındaki bilgileri yapıştır." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Etiketleri Yapıştır" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "" +"Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle." + +#: ../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 "Tercihler..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Genel ayarlar için tercihler sayfasını aç." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Tercihler" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Tekrar Yap" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Son bitmemiş komutu tekrar yap." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Takayı yeniden isimlerdir" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Dosyayıda yeniden isimlendir" + +#: ../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 "Yolları ters çevir" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Seçili yollar için yönü ters çevir." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Lütfen en az bir yol seçiniz." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Yolları ters çevir" + +#: ../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 "Kaydet" + +#: ../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 "Şimdiki bilgiyi kaydet." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "" + +#: ../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 "Boş döküman" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Çelişkiler" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "" + +#: ../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 "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "OSM dosyası olarak sakla" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "GPX olarak sakla" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "" + +#: ../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 "Farklı Kaydet..." + +#: ../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 "Varolan bilgileri yeni bir dosyaya kaydet." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Hepsini Seç" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Bütün silinmesi geri alınan objeleri bilgi tabakasında seç. Bu aynızamanda " +"eksik objeleride seçer" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Yolları Böl" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Seçili kavşakta yolu böl." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Yapılan seçim bölme için kullanılamaz." + +#: ../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] "Seçili kavşak herhangi bir yolun ortasında değil." + +#: ../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] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar." + +#: ../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] "Seçili yol seçili kavşakları içermiyor." + +#: ../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 "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz." + +#: ../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 "" +"Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)" + +#: ../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 "{0} Yolu {1} parçaya bölünecek" + +#: ../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 "GPX hatlarını sabitle" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "GPS noktaları boyunca çiz." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Genel ayarları sabitle ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Yolları Çıkar" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Birçok yol tarafında kullanılan kavşakları çift yap." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "Bu kavşak başka bir nesneye yapışık değil." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Kavşakların hiçbiri herhangi bir nesneye yapışık değil." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Yolların kavşakları herhangi nesneye yapışık değil." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Seçim çıkartmak için kullanılamaz." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Şunların Arasında Seçiniz:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* Birden fazla yol için kullanılan kavşak, veya" + +#: ../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 "* Birden fazla yol için veya şu yollardan biri için, veya" + +#: ../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 "" +"* Bir veya birden kavşağı olan yol, birden fazla yol tarafında " +"kullanılabilir, veya" + +#: ../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 "" +"* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." + +#: ../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 "" +"Not:Bir yol seçili ise, bu yol çıkartılmış kavşaklardan yeni bir kopya\n" +"oluşturur ve yeni kavşaklar seçilir. Aksi halde, bütün yollar kendi " +"kopyalarını oluşturur ve bütün kavşaklar seçilir" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "{0} kavşak değiştirildi" + +#. 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 "{0} kavşalarını {1} kavşakları üzerine getir" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Geri AL(undo)" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Son komutu geri al." + +#: ../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 "Seçimleri Kaldır" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Objelerdeki seçimi kaldır." + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Seçimleri Kaldır (Odak)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Seçimleri Kaldır (Kaçış)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "" + +#. 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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "OSM ye yükle..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Bütün değişiklikleri OSM server'ına yükle." + +#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Yüklenilecek değişiklik yok." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "" + +#: ../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 "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "İçeri Yakınlaştır" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Zoom Out" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Geri" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Geri Atla." + +#: ../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 "Ses: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Hızlı" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Hızlı İleri" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "İleri" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "İleri atla" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Diğer İmleç" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Diğer imleci oynat." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Oynat/Dondur" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Oynat/Dondur ses." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Önceki İmleç" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Önceki imleci oynat." + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Yavaş" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Yavaş İleri Götür" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "GPS verisi indiriliyor" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Ham GPS verisi" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Bilgi İndiriliyor" + +#: ../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 "İçeri bilgi alınamadı." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap verisi" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Silme Modu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Kavşak veya yolları sil." + +#: ../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 "Mode: {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 "" +"Silmek için tıklayınız. Shift: yol segmentini siler. Alt: kullnılmayan " +"kavşakları silmebir yol silerken. Ctrl:referans objelerini sil" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2199,18 +2055,18 @@ "senkronize etmek için." -#: ../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 "Seçiniz" -#: ../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 "Objeyi seç,taşı ve dönder" -#: ../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" @@ -2219,17 +2075,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 "" @@ -2239,5 +2095,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 "" @@ -2406,41 +2262,41 @@ msgstr "Arama" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "" -#: ../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 "''{0}'' için herhangi karşılık bulunamadı" -#: ../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 "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../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 "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../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 "{0} Eşleşme bulundu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2453,40 +2309,40 @@ "{2}" -#: ../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 "" -#: ../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 "or için eksik argüman." -#: ../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 "not için eksik argüman." -#: ../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 "Parantezlerin kapanması beklenir." -#: ../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 "" @@ -2495,5 +2351,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." @@ -2530,7 +2386,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Kavşak Ekle" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2540,52 +2396,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "İlişkiler: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "{0} Objeyi Değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Son değişiklik: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "İlişkiyi değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "Kaldır \"{0}\" için {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "Kaldır \"{0}\" için {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "Kaldır \"{0}\" için {1} ''{2}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "Ayarla {0}={1} için {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "Ayarla {0}={1} için {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "Ayarla {0}={1} için {2} ''{3}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2654,26 +2510,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] "Sil {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] "Silme Modu" +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] "Sil {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} İlişki" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2687,20 +2547,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"Seçim \"{0}\" ,\"{1}\" ilişkisi tarafından {2} rölü için kullanılıyor.\n" -"İlişkiden sil?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n" -"İlişkiden Sil?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2711,5 +2567,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." @@ -2789,17 +2645,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2809,17 +2665,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Çözümle {0} karşıklıkları {1} objelerinde" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2957,9 +2813,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3026,5 +2882,5 @@ msgstr "D" -#: ../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 @@ -3032,23 +2888,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 "parametre ''{0}'' zero (null) olamaz" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "Hata: {0}" -#: ../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 "Uyarı: {0}" -#: ../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 @@ -3061,11 +2942,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 "" @@ -3116,9 +3002,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 "Alan stili yol kapalı değil." -#: ../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." @@ -3127,118 +3013,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 "İlişkide boş üye." -#: ../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 "''{0}'' üyesini ilişkiden sil." -#: ../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 "Yol ''{0}'' iki noktadan az içeriyor." -#: ../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 "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." -#: ../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 "Yol-Değil ''{0}'' multipolygon içinde." -#: ../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 "Multipoligon için dış yol yok ''{0}''." -#: ../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 "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." -#: ../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 "iç yol ''{0}'' dışarıda." -#: ../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 "İç yol stili ''{0}'' multipolygon ." -#: ../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 "Dış yol stili ''{0}'' bulunamadı." -#: ../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 "etiketsiz" -#: ../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 "metin" @@ -3261,5 +3147,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" @@ -3269,5 +3155,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" @@ -3277,5 +3163,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" @@ -3383,5 +3269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "demiryolu" @@ -3411,127 +3297,34 @@ msgstr[0] "{0} üye" -#: ../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 "bilinmeyen" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 +#, fuzzy +msgid "Bad Request" +msgstr "Raket Düzenle" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Tanımsız 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 "" @@ -3751,5 +3544,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}" @@ -4126,4 +3919,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 @@ -4195,8 +3990,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 @@ -4319,5 +4114,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 "silindi" @@ -4377,5 +4172,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 "" @@ -4417,4 +4212,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 @@ -4428,5 +4224,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 "" @@ -4532,4 +4328,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 "Yakınlaştıracak bir çakışma yok." + +#: ../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 @@ -4542,24 +4374,23 @@ msgstr "hepsi" -#: ../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 "Renk seç" - -#: ../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}''" @@ -4567,7 +4398,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 "parametre ''{0}'' zero (null) olamaz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4580,14 +4411,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 "Henuz Yapılmadı." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4596,17 +4428,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "Yolları şu şekilde etiketle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "İlişkiyi değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "İndirirken çakışmalar oldu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4628,24 +4457,8 @@ msgstr[0] "{0} İlişki" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Çözünürlüğü değiştir" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Çakışmaları Çöz" - -#: ../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 "Yapıştır" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4660,8 +4473,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} Yol" +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 "Seçili satırdaki üyeyi bu ilişkiden kaldır" + +#: ../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 "yer" + +#: ../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 "Anahtar:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Değer" + +#: ../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 "tek Yol" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revizyon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4688,5 +4567,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}" @@ -4717,5 +4596,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." @@ -4788,13 +4667,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 "Harita: {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 "İlişkiler: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4879,5 +4758,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 +4814,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 "Ekle" @@ -4983,5 +4862,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 "İlişkiler" @@ -5074,8 +4953,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] "yazar" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5168,5 +5048,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}" @@ -5184,9 +5064,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 "" @@ -5437,11 +5312,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 "" @@ -5455,7 +5330,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Eski eklentiler yükleniyor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5578,5 +5452,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Yerler" @@ -5654,9 +5528,12 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 +#, fuzzy msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." -msgstr "" +"Hold left mousebutton and draw a frame." +msgstr "" +"Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi oynat." +"Seçim:Klik" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -5705,7 +5582,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Tercihleri server'a yükleyiniz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6588,52 +6464,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 "İsim" @@ -6643,11 +6519,10 @@ 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 "İlişkiyi değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 @@ -6656,7 +6531,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Son değişiklik: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6674,7 +6549,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Sokak Adı" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6715,12 +6589,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Lütfen bir değer seçiniz" +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 "parametre ''{0}'' zero (null) olamaz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6761,7 +6634,8 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6776,7 +6650,8 @@ "html>" msgstr[0] "" +msgstr[1] "" #: ../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 "" @@ -6792,7 +6667,8 @@ "changes.
Layers with non-writable files:" msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6806,7 +6682,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Vazgeç ve Çık" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6819,7 +6694,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Kaydet ve Çık" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6897,7 +6771,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "Yükleme" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6906,12 +6779,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java: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 "Eklenilecek objeler:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Düzenlenecek objeler:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Silinecek objeler:" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Dosya" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Değişiklikleri yükle?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Yenile" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Lütfen bu yer için bir isim giriniz." + +#: ../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 @@ -7144,5 +7146,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." @@ -7200,7 +7201,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Bilgi İndiriliyor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7262,4 +7262,13 @@ msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" + +#: ../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 "" +"İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.
Eğer izleri " +"yüklemek isterseniz buraya bakınız:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7441,5 +7450,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 "Silmek için bir satır seçiniz." @@ -7897,7 +7906,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "Seçim listesindeki objenin ID sini göster" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7912,7 +7920,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "Seçim listesindeki objenin ID sini göster" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8278,8 +8285,4 @@ msgstr "Etkisiz Kıl" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "Anahtar:" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8336,5 +8339,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 @@ -8345,42 +8348,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Yorum Ekle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Seçili tabakayı sil." - -#: ../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 "" #. 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 "Seçilebilen Özellikler:" -#: ../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 "''{1}'' gurubu için ''{0}'' kullan" -#: ../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 "''{0}'' ı kullan" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "" -#: ../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 "" -#: ../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 @@ -8391,15 +8392,15 @@ msgstr "Etiketteki özellikler okunamadı: {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 "İşleme Hatası {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 "" -#: ../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 @@ -8408,18 +8409,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../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 "" -#: ../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 "Özellikleri Değiştir" @@ -8446,5 +8447,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 "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." @@ -8460,7 +8460,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 @@ -8538,5 +8535,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}" @@ -8544,5 +8541,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" @@ -8550,5 +8547,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" @@ -8569,6 +8565,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 @@ -8578,40 +8574,40 @@ msgstr "OSM bilgisi indiriliyor..." -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8673,10 +8669,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 "" @@ -8684,11 +8680,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 "Açılıyor..." - -#: ../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}" @@ -8696,34 +8690,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 "Açılıyor..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Açılıyor..." - -#: ../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 "Açılıyor..." - -#: ../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 " @@ -8731,44 +8709,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../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 "Kapanıyor..." - -#: ../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 "Açılıyor..." - -#: ../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 "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Yükleniyor..." -#: ../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}." @@ -8787,10 +8765,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 "" @@ -8848,6 +8826,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 "" @@ -8876,5 +8859,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 "" @@ -8931,74 +8914,139 @@ msgstr "Ayrıştırma sırasında hata oluştu." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Bilinmeyen versiyon" - -#: ../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 "Gerekli özellik eksik \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "çözülen versiyon:" + +#: ../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 "-bileşene erişelemdi." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " in içi boş" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr ". eleman ile bağlantı bulunamadı." - -#: ../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 "Ref=0, eksik tanımı." -#: ../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 "Geçersiz obje bulundu 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 "Gerekli özellik eksik \"{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 "" @@ -9007,16 +9055,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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "Yanlış tanımlı kavşak bilgisi" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Bilgiler hazırlanıyor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Bilgiler hazırlanıyor..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9063,33 +9125,43 @@ "ediniz." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +#: ../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 "Yükleniyor..." + +#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9127,11 +9199,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 "" @@ -9144,4 +9211,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 @@ -9183,20 +9255,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 "Eklentiyi Pasif Yap" #: ../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 "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?" -#: ../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 " @@ -9206,5 +9278,9 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../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 "" @@ -9212,10 +9288,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../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 "Eklenti Yazarın {0} Olduğunu Belirtiyor." -#: ../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." @@ -9223,9 +9299,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../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 "Eklentiyi Pasif Hale Getireyim mi?" -#: ../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 " @@ -9235,13 +9311,13 @@ "çalıştırın." -#: ../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" @@ -9296,4 +9372,35 @@ "\n" "{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 "bilinmeyen" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9368,4 +9475,91 @@ msgstr "(Metin zaten panoda mevcut.)" +#: ../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 +#, fuzzy +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 "" +"Max seçim alanı boyutu 0.25 ve sizin alanınız çok büyük. Daha küçükalan " +"seçiniz veya planet.osm yi kullanın" + +#: ../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 @@ -9435,5 +9629,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9442,5 +9636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9449,5 +9643,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9456,5 +9650,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9463,5 +9657,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9520,40 +9714,39 @@ msgstr "İzleri Yükle" -#: ../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}" @@ -9561,47 +9754,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 "Bağlanıyor..." -#: ../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 "GPX tabakası seçili değil. İz yüklenemez." -#: ../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 "İzleri Yükle" @@ -9819,5 +10012,5 @@ msgstr "imaj henuz etiketlenmedi" -#: ../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 "imaj ile GPX izini ilişkilendir" @@ -9831,13 +10024,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 "GPX izi seçmelisiniz" -#: ../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 "seçili GPX izi yok" -#: ../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 "" @@ -9848,9 +10041,9 @@ "İstenen format: {0}" -#: ../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 "Geçersiz zaman dilimi" -#: ../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 "" @@ -9861,65 +10054,65 @@ "İstenen format: {0}" -#: ../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 "Geçersiz offset" -#: ../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 "GPX izi yüklendi" -#: ../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 " @@ -9927,13 +10120,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 "" @@ -9971,5 +10164,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 "Dosya Yüklemede Sorun" @@ -10016,13 +10209,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" @@ -10031,13 +10224,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 "" @@ -10147,9 +10340,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 "" @@ -10302,7 +10495,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Seçiniz" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10385,5 +10577,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 "Boş Tabaka" @@ -11318,18 +11510,18 @@ msgstr "Bilinmeyen konu durumu" -#: ../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 "Görünür Aç..." -#: ../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 "Sadece şimdiki ekrandaki görünen dosyaları aç." -#: ../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 "Görünüm açılamadı-Sınırlar belirlenemiyor" -#: ../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}" @@ -11340,5 +11532,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11348,9 +11540,9 @@ "ayarlarını yapınız" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender seçenekleri" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox exe" @@ -11361,28 +11553,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Seçili Objeleri Sil." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "Seçimi değiştir" -#: ../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 "Görünüm yerini değiştir" -#: ../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 "Uzak kontol hareketlerini, manual kontrol et" -#: ../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 "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API." -#: ../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 "Uzak Kontrol" -#: ../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 "Uzak kontrol eklenti ayarları." -#: ../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 " @@ -11393,28 +11590,35 @@ "uygulamaların eklenti ile haberleşmesi için kullanılır." -#: ../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 "Onaylanan Hareket" -#: ../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 "API tarafından uzaktan kontrol veri yüklemesi soruldu." -#: ../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 "İstek Detayı: {0}" -#: ../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 "Buna izin veriyormusunuz?" -#: ../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 "uzak kontrol haereketini onayla" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu." + +#: ../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 "Şu linkten uzak kontrolle veri alınmak istenildi.Link:" @@ -11908,25 +12112,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Bütün çakışmaları için yeni değerler gir." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Çakışmaları Çöz" + #: ../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 "" @@ -11997,6 +12209,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 "Onaylama Hataları" @@ -12006,10 +12218,10 @@ msgstr "Onaylama hatası yok" -#: ../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 "Grid" -#: ../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 "" @@ -12099,51 +12311,65 @@ msgstr "Veri doğruluğunu kontrol et" -#: ../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 "Hatalar içeren veri. Yinede yükle?" -#: ../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 "Onaylama penceresini aç." -#: ../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 "Probleme Yaklaş" -#: ../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 "Onar" -#: ../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 "Seçili hataları onar." -#: ../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 "Yoksay" -#: ../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 "Seçili hatalara gelecek sefere bak." -#: ../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 "Bütün Grup" -#: ../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 "Tek Eleman" -#: ../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 "Hiçbişey" -#: ../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 "Bütünm grubu veya tek elemanları yoksay?" -#: ../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 "elemanlar Yoksayılıyor" + +#: ../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 "Yükleniyor..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12169,16 +12395,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." msgstr "" -"Bu test, iki farklı yol, suyolu veya demiryolunun farklı tabakalarda " -"kesişiminifakat kesişen nokta içermemelerini kontrol eder" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "kesişine yollar" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12186,19 +12408,18 @@ msgstr "kesişine yollar" -#: ../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 "Çift Noktalar" -#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 -#, fuzzy +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" -msgstr "Aynı isimli noktalar" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12206,19 +12427,16 @@ #: ../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 "Çift Yol" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Çiftli yol oluştur" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12793,5 +13011,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "İstisna oluştu" @@ -12875,5 +13093,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 " @@ -12881,5 +13099,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 "" @@ -12897,17 +13115,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 "" @@ -12948,19 +13166,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "atanmış" - -#: ../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 "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../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 "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -12971,14 +13188,13 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "Geçersiz Tarih" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12987,96 +13203,108 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../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 "WMS tabakasını dosyaya kaydet" -#: ../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 "WMS tabakasını dosyadan yükle" -#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "WMS" -#: ../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 "Veri yüklemek için boş bir WMS tabakası aç" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "WMS Eklenti Tercihleri" -#: ../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 "WMS eklenti menusundeki, WMS server listesini değiştir" -#: ../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 "Menu İsmi" -#: ../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 "WMS linki" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "Menu ismi (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "WMS linki (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "Menu ismi ve WMS linki kullanınız" -#: ../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 "Varsayılanı kopyala" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +msgid "Overlap tiles" +msgstr "Üstüste gelen alanlar" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 #, fuzzy -msgid "Please select at least one row to copy." -msgstr "Lütfen en az bir yol seçiniz." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" -msgstr "" +msgid "% of north:" +msgstr "kuzey" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -13445,5 +13673,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 "Referans" @@ -13985,7 +14213,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "kulübe" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14006,8 +14233,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 "araç kiralam" +msgstr "" #. color heath @@ -14025,5 +14251,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 "orman" @@ -14036,7 +14263,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "Park_bileti" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14072,7 +14298,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "parke taşı" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14083,7 +14308,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "eksik" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14094,7 +14318,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "ot" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14288,4 +14511,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" @@ -14314,12 +14538,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 "Evet" #. color permissive -#. +#. #. 1 #. 40000 @@ -14367,5 +14591,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14402,5 +14626,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14464,6 +14688,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 "hayır" @@ -14609,6 +14834,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 "Tip" @@ -14879,7 +15104,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "Yaya Yolu" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14898,7 +15122,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Spikes" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15190,7 +15413,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 "Operator" @@ -15403,6 +15626,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 "yükseklik" @@ -16314,7 +16537,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" @@ -16362,23 +16582,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 "Açılış saati" @@ -16402,5 +16622,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" @@ -16447,22 +16666,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 "" @@ -16477,22 +16696,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 "" @@ -16507,22 +16726,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 "" @@ -16556,5 +16775,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 "Referans Numarası" @@ -16574,7 +16793,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "park_ve_sür" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16588,7 +16806,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "kapasite" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16598,12 +16815,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "Özürlü Alanı" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "Özürlü Alanı" +msgstr "" #: build/trans_presets.java:1400 @@ -16805,5 +17020,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "Sığınak" @@ -17188,7 +17403,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "Dur" +msgstr "" #. color tertiary @@ -17231,28 +17445,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "çinli" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Alanı indir" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Yapıştır" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Şehir" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "yöresel" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17280,7 +17489,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Dağ gezisi" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17294,7 +17502,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "yük boşaltma yeri" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17311,13 +17518,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Sınır kontrol noktası" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "Polis" +msgstr "" #: build/trans_presets.java:1737 @@ -17334,7 +17539,6 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "arazi kullanımı" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" @@ -17345,19 +17549,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Bilgi" +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 "gps iz tanımı" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Ses" +msgstr "" #. @@ -17368,7 +17569,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefon Numarası" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17692,5 +17892,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17724,5 +17924,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18848,6 +19048,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 "Din" @@ -18856,66 +19056,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 "bahai" -#: 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 "hristiyan" -#: 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 "jain" -#: 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 "yahudi" -#: 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 "müslüman" -#: 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 "Zerdüştlük" -#: 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 "mezhep" @@ -18924,76 +19124,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 "anglikan" -#: 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 "katholik" -#: 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 "protestan" -#: 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 "yahova_şahitleri" -#: 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 "lutheran" -#: 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 "methodist" -#: 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 "mormon" -#: 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 "orthodox" -#: 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 "pentecostal" -#: 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 "presbyterian" -#: 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 "protestant" -#: 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 "quaker" -#: 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 "shia" -#: 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 "sunni" @@ -19325,5 +19525,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 "Not" @@ -19348,5 +19548,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 "Madeni Para" @@ -19354,5 +19554,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 "Notlar" @@ -19360,5 +19560,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 "Elektronik cüzdan ve Para Değişim Kartları" @@ -19366,5 +19566,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 "ATM kartı" @@ -19372,5 +19572,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 "Kredi Kartı" @@ -19429,10 +19629,144 @@ msgstr "banket" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Geri" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Abide" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "boş" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "yer" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Renk" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Geri" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "aşağı" + +#. 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 "yeşil" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "bitiş" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Değer" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "su" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "Kablo Miktarı" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Av Standı" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Av Standı Düzenle" @@ -19441,30 +19775,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 "Yükseklik" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "alçak" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "yarım" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "tam" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Sakla" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Kilitle" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Kaynak" @@ -19473,10 +19807,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Kaynak Düzenle" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "İçme Suyu" @@ -19485,10 +19819,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "İçme Suyu Düzenle" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "Bebek Yuvası" @@ -19496,35 +19830,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "Bebek Yuvası Düzenle" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Dükkanlar" #. 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 "Supermarket Düzenle" -#: build/trans_presets.java:2472 -#, fuzzy +#: build/trans_presets.java:2475 msgid "Chemist" -msgstr "kulübe" - -#. item -#: build/trans_presets.java:2473 -#, fuzzy +msgstr "" + +#. item +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "külübe düzenle" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Bakkal" @@ -19532,9 +19864,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Bakkal Düzenle" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19542,29 +19874,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Kiosk Düzenle" -#: 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 "otobüs durağı düzenle" - -#: 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 "Ağaç Düzenle" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "Kahve Makinası" @@ -19572,5 +19902,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "Kahve Makinası Düzenle" @@ -19578,88 +19908,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "Ücretli Ürünler" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "toplu_taşıma_bileti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "toplu_taşıma_hatları" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "Park_bileti" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "yiyecek" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "içecek" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "tatlı" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "sigara" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotoğraf" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "hayvan_besini" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "gazeteler" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "oyuncuklar" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "pullar" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kart" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefon_kartı" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "bilet" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "kondom" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampon" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "dışkı_poşeti" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "hesap veya üyelik kartı" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "kasap" @@ -19667,9 +19997,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "kasap düzenle" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "fırın" @@ -19677,9 +20007,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "fırın düzenle" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "" @@ -19687,18 +20017,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "" @@ -19706,54 +20036,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "" #. 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 "" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "" -#: 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 "" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "" @@ -19761,9 +20091,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19771,9 +20101,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "kendin-al-market" @@ -19781,54 +20111,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "kendin-al-market düzenle" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "berber" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "berber düzenle" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Kuru Temizleme" @@ -19836,9 +20166,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Kuru Temizleme Düzenle" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Çamaşırhane" @@ -19846,9 +20176,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Çamaşırhane Düzenle" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Dışortam" @@ -19856,32 +20186,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Dış ortam dükkanları düzenle" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Kasa" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Banka" @@ -19889,14 +20219,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Banka düzenle" -#: 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 "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Döviz Bürosu" @@ -19904,5 +20234,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Döviz Bürosu Düzenle" @@ -19910,15 +20240,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "ATM Düzenle" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Sağlık" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Doktor" @@ -19926,18 +20256,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Doktor Düzenle" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Dişçi" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Dişçi Düzenle" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Eczane" @@ -19945,5 +20275,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Eczane Düzenle" @@ -19951,9 +20281,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Dispenser" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Hastane" @@ -19961,10 +20291,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Hastane Düzenle" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Acil Durum Noktası" @@ -19973,5 +20303,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Acil Durum Noktası Düzenle" @@ -19980,20 +20310,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Nokta Numarası" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefon Numarası" #. 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 "(Uluslararası kod kullanın, ör +90-212-67890)" @@ -20001,5 +20331,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 "Veteriner" @@ -20008,55 +20338,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Veteriner Düzenle" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Kıta" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Kıta Düzenle" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Ülke" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Ülke Düzenle" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "İl" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "İl Düzenle" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Bölge" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Bölge Düzenle" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "vilayet" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "vilayet Düzenle" @@ -20064,15 +20394,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Şehir" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Şehir Düzenle" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Mahalle" @@ -20080,10 +20410,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Mahalle Düzenle" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Banliyo" @@ -20091,25 +20421,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Banliyo Düzenle" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Köy" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Köy Düzenle" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Mezra" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Mezra Düzenle" @@ -20117,5 +20447,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Semt" @@ -20123,10 +20453,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Semt Düzenle" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Ada" @@ -20134,24 +20464,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Ada Düzenle" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "sol" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "külübe düzenle" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Mağara Girişi" @@ -20159,10 +20487,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Mağara Girişi Düzenle" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Zirve" @@ -20170,10 +20498,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Zirve Düzenle" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Buzul" @@ -20181,10 +20509,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Buzul Düzenle" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Volkan" @@ -20192,70 +20520,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Volkan Düzenle" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Belediye Sınırı" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Milli" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Ülke Sınırı Düzenle" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "İdari" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "İdari Sınırları Düzenle" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Sivil" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Sivil Sınırları Düzenle" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Politik Sınır Düzenle" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Milli Park Sınırı Düzenle" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Arazi Kullanımı" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Ağaç" @@ -20264,15 +20592,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Ağaç Düzenle" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botannik İsim" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Orman" @@ -20281,5 +20609,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Orman Düzenle" @@ -20287,17 +20615,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 "Kozalaklı Orman" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "yaprak düken orman" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "karışık" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "orman" @@ -20306,14 +20634,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "orman kullanımı düzenle" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "korunacak doğa alanı" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "korunacak doğa alanı düzenle" @@ -20321,25 +20649,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "Taşlık Alan" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Taşlık Alan Düzenle" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Çalılık" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Çalılık Düzenle" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Dağ Eteği" @@ -20347,10 +20675,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Dağ Eteği Kullanımı" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Sağlıksız Ağaç" @@ -20358,5 +20686,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Sağlıksız Ağaç Düzenle" @@ -20364,5 +20692,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Çiftlik" @@ -20371,45 +20699,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Çiftlik Kullanımı Düzenle" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Çiftlik Arazisi" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Çiftlik Arazisi Kullanımı Düzenle" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Bağ" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Bağ Kullanımı Düzenle" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Kiralık Tarım Alanı" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Kiralık Tarım Alanı Düzenle" @@ -20417,25 +20745,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Bahçe" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Bahçe Düzenle" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Otlak" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Otlak Kullanım Düzenle" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Köy Yerleşimi" @@ -20443,10 +20771,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Köy Yerleşimi Düzenle" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Genel" @@ -20454,20 +20782,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Genel Düzenle" #. 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 "Park Düzenle" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "oyun alanı" @@ -20475,5 +20803,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "oyun alanı kullanımı düzenle" @@ -20481,15 +20809,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Yerleşim Alanı" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Yerleşim Alanı Kullanımı Düzenle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Mezarlık" @@ -20497,9 +20825,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Mezarlık Düzenle" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Mezarlık" @@ -20507,39 +20835,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Mezarlık Kullanımı Düzenle" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Perakende" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Perakende Alan Kullanımı Düzenle" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Ticari" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Ticari Alan Kullanımı Düzenle" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Endüstriyel" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Endüstriyel Alan Kullanımı Düzenle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Demiryolu alanı" @@ -20547,15 +20875,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Demiryolu alanı kullanımı düzenle" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Askeri" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Askeri Alan Düzenle" @@ -20563,55 +20891,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "İnşaat Alanı" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "İnşaat Alanı Düzenle" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Ağaçsız_Alan" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Ağaçsız_Alan Kullanımı Düzenle" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Yeşil Alan" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "yeşil Alan kullanımı düzenle" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Toprak Dolum" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Toprak Dolum Alanı Düzenle" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Taşocağı" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "taşocağı Düzenle" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20621,5 +20949,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 "" @@ -20628,10 +20956,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20639,5 +20967,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20646,5 +20974,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20652,34 +20980,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20688,15 +21016,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20704,5 +21032,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20711,5 +21039,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20717,5 +21045,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20723,5 +21051,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20787,5 +21115,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 @@ -20794,17 +21122,17 @@ msgstr "bisiklet" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "otobüs" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20857,5 +21185,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 @@ -20864,13 +21192,13 @@ msgstr "ayak" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20884,10 +21212,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20895,31 +21223,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20928,30 +21256,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24104,76 +24432,4 @@ msgstr "tarihi" -#. 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 "yeşil" - #. color green #. @@ -25141,43 +25397,45 @@ msgstr "" -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi." - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." +#. 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 "Bütün yollar boştu" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?" + +#~ msgid "Merge Anyway" +#~ msgstr "Neyse Birleştir" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata " -#~ "olarak bildiriniz" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Döküman açık değil Kayıt yapılamaz." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Sil {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Tercihler klasörü açılamıyor: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Yazarlar: {0}" - -#~ msgid "map" -#~ msgstr "harita" - -#~ msgid "citymap" -#~ msgstr "şehir haritası" - -#~ msgid "hikingmap" -#~ msgstr "gezirehberi" - -#~ msgid "bicyclemap" -#~ msgstr "bisikletharitası" - -#~ msgid "board" -#~ msgstr "yiyecek noktası" +#~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor " +#~ "musun?" + +#~ msgid "Unknown version" +#~ msgstr "Bilinmeyen versiyon" + +#~ msgid "Found element in non-way." +#~ msgstr "-bileşene erişelemdi." + +#~ msgid " has zero ref" +#~ msgstr " in içi boş" + +#~ msgid "Found element in non-relation." +#~ msgstr ". eleman ile bağlantı bulunamadı." + +#~ msgid "Ill-formed node id" +#~ msgstr "Yanlış tanımlı kavşak bilgisi" #~ msgid "" @@ -25205,4 +25463,7 @@ #~ msgstr "İptal Edildi..." +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi." + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Fare veya Ctrl+ok tuşları ile /./ zoom ve pan yapabilirsin." @@ -25219,7 +25480,4 @@ #~ msgid "Add all currently selected objects as members" #~ msgstr "Seçili bütün objeleri üye olarak ekle" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır" #~ msgid "There were conflicts during import." @@ -25248,4 +25506,7 @@ #~ "selected in the history list." #~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir" + +#~ msgid "Authors: {0}" +#~ msgstr "Yazarlar: {0}" #~ msgid "Conflicts: {0}" @@ -25303,4 +25564,7 @@ #~ msgstr "Eklentinin silinmesinde hata: {0}" +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Tercihler klasörü açılamıyor: {0}" + #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -25312,7 +25576,4 @@ #~ msgid "their version:" #~ msgstr "onların versiyonu:" - -#~ msgid "resolved version:" -#~ msgstr "çözülen versiyon:" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -25334,4 +25595,7 @@ #~ msgid "Change" #~ msgstr "Değiştir" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Sil {1} {0}" #~ msgid "true" @@ -25372,7 +25636,20 @@ #~ msgstr "bazı kavşaklar zaten hizada" +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata " +#~ "olarak bildiriniz" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Döküman açık değil Kayıt yapılamaz." + #~ msgid "Unknown file extension." #~ msgstr "Bilinmeyen dosya uzantısı." +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." + #~ msgid "Data Layer" #~ msgstr "Bilgi Tabakası" @@ -25390,11 +25667,4 @@ #~ msgstr "TCX Dosyasını GPS izi olarak içeri al" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi " -#~ "oynat.Seçim:Klik" - #~ msgid "Validate" #~ msgstr "Onayla" @@ -25402,7 +25672,4 @@ #~ msgid "Validate either current selection or complete dataset." #~ msgstr "Aktif seçimi veya bütün veriyi onayla." - -#~ msgid "end" -#~ msgstr "bitiş" #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -25492,4 +25759,19 @@ #~ msgstr "Demir parmaklık" +#~ msgid "map" +#~ msgstr "harita" + +#~ msgid "citymap" +#~ msgstr "şehir haritası" + +#~ msgid "hikingmap" +#~ msgstr "gezirehberi" + +#~ msgid "bicyclemap" +#~ msgstr "bisikletharitası" + +#~ msgid "board" +#~ msgstr "yiyecek noktası" + #~ msgid "Charge" #~ msgstr "Para Değişim" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 17594) +++ /applications/editors/josm/i18n/po/zh_TW.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-18 14:23+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 12:54+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,9 +16,9 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\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" @@ -26,5 +26,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 @@ -33,18 +33,20 @@ msgstr "說明" -#: ../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 "無法使用投影法 {0}。改用麥卡托投影" -#: ../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 @@ -60,8 +62,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 @@ -75,6 +77,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 @@ -84,5 +86,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 @@ -102,53 +104,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 "錯誤" -#: ../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] "還有尚未儲存的變更。是否要放棄變更後繼續？" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "未儲存的變更" -#: ../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 "存檔後離開" -#: ../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 "放棄修改且離開" -#: ../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 +157,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 +176,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 "取消" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正確的 URL: \"{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 +206,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 +245,14 @@ msgstr "警告" -#: ../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 "忽略格式不良的檔案 URL： \"{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 +342,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 "外掛" @@ -468,9 +471,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 +507,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 +525,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 "資訊" @@ -548,5 +551,5 @@ msgstr "請至少選取三個節點" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -555,10 +558,10 @@ msgstr "" -#: ../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 能力" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -567,5 +570,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 +577,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "違反先決條件" -#: ../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 +634,22 @@ msgstr "沒有要縮放的衝突" -#: ../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 "合併路徑" -#: ../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 "合併多個路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "請選擇至少兩個以上的路徑來合併" - -#: ../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 "是否組合有不同關係成員的路徑？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "合併，不管怎樣" -#: ../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 " @@ -658,13 +657,13 @@ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "改變路徑方向?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "反轉後組合" -#: ../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 " @@ -672,30 +671,18 @@ msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？" -#: ../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 "輸入所有衝突項目的數值。" - -#: ../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 "解決衝突" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "組合 {0} 條路徑" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "所有的路徑都是空的" - -#: ../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 "不能組合路徑（它們無法合併為節點的單一字串）" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "組合 {0} 條路徑" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "請選擇至少兩個以上的路徑來合併" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -749,5 +736,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 "刪除" @@ -757,15 +744,15 @@ msgstr "刪除選擇的物件" -#: ../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 "覆寫" -#: ../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 "檔案已存在，要覆蓋嗎?" @@ -794,10 +781,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}" @@ -828,5 +815,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 @@ -869,7 +856,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "所有圖片" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1006,1022 +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 "合併節點" -#: ../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 "將節點合併到最舊的一個中。" -#: ../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 "請至少選取兩個節點來合併" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 -msgid "Merge nodes with different memberships?" -msgstr "是否合併有不同成員的節點？" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "強制合併" - -#: ../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 "選取的節點有不同的關係成員。是否仍要合併它們？" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "不能合併節點。會刪除仍在使用的路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "合併 {0} 個節點" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "" - -#: ../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 "鏡射" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "鏡射選取的節點和路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "請選擇至少一個節點或路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "上" - -#: ../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 "移動物件 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "下" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "左" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "右" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "移動 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "移動物件 {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 "不能將物件移動到世界外頭" - -#: ../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 "新增" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "建立新地圖" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "開啟..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "開啟檔案" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "開啟檔案" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, fuzzy, java-format -msgid "Opening file ''{0}'' ..." -msgstr "不明的角色「{0}」。" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "開啟位址..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "開啟 URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "另外的圖層" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "輸入要下載的 URL：" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "下載位置" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "下載 URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "形狀直角化" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "移動節點讓所有角度成為 90 或 270 度" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "只允許兩個節點" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "選擇區域只能由路徑組成。" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "請選擇一或多個至少有四個節點的封閉路徑。" - -#: ../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 "只選取一個節點" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "直角化" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "貼上" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "從剪貼緩衝區貼上內容。" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "貼上標籤" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "將剪貼緩衝區的標籤套用到所有選取的項目上。" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, fuzzy, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "正在載入 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "偏好設定..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "開啟偏好全域設定設定頁面" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "偏好設定" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "重做" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "重做上次復原的動作。" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "圖層更名" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "同時重新命名該檔案" - -#: ../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 "反轉路徑" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "反轉所有選取路徑的方向。" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "請選擇至少一條路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "反轉路徑" - -#: ../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 "存檔" - -#: ../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 "儲存現在的資料" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "檔案 {0} 已存在。是否覆蓋？" - -#: ../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 "空的文件" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "文件沒有包含資料。" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "強制儲存" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "衝突" - -#: ../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 "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "拒絕衝突項目並儲存" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "儲存 OSM 檔案" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "儲存 GPX 檔案" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "儲存圖層" - -#: ../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 "另存檔案..." - -#: ../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 "將目前的資料儲存為新的檔案。" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "全選" - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "顯示狀態報告" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "顯示有與程式錯誤相關資訊的狀態報告" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "求助：{0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "狀態報告" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "複製到剪貼簿並關閉" - -#: ../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 "關閉" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "切割路徑" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "在選取的節點上切割路徑" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "不能在選取的節點上切割路徑" - -#: ../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] "選取的節點不在任何路徑上" - -#: ../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] "節點上不只有兩個路徑。請同時選取你想切割的路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "選取的節點不在同一個路徑上。" - -#: ../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] "選取的路徑未包含選取的節點。" - -#: ../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 "你必須選擇兩個以上的節點來切割一個環狀路徑" - -#: ../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 "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）" - -#: ../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 "將路徑 {0} 分割為 {1} 個部分" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "正在關閉資料組合..." - -#: ../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 "正在關閉資料組合..." - -#: ../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 "正在開啓資料組合..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -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 "切換 GPX 線條" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "繪出原始 gps 點之間的線條。" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "切換全城設定值「{0}」。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "取消黏合路徑" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "重製由多條路徑使用的節點。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "這個節點並未黏合到其他項目上。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "這些節點沒有一個黏合到其他項目上。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "這個路徑的節點沒有一個黏合到其他項目上。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "目前的選擇區域不能用於取消黏合。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "選擇其一：" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* 一個有標籤的節點，或" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* 一個用於多條路徑的節點，或" - -#: ../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 "* 一個用於多條路徑或用於那些路徑之一的節點，或" - -#: ../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 "* 一個有一或更多節點用於多條路徑的路徑，或" - -#: ../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 "* 一個路徑且其一或多個節點用於多條路徑。" - -#: ../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 "" -"注意：如果選取了路徑，這個路徑會取得取消黏合節點的最新複本並且會\n" -"選取這些新節點。否則，所有路徑會取得他們自己的複本而且所有的節點\n" -"都會被選取。" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "取消黏合節點" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "" - -#. 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "復原" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "復原最後的動作。" - -#: ../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 "取消全選" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "取消選擇所有的物件。" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "取消全選（焦點）" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "取消全選（跳出）" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "更新資料" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "從伺服器更新目前的資料圖層（重新下載資料）" - -#. 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 "" - -#: ../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 "更新選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "選擇區域是空的" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "上傳至 OSM..." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "將所有的變更上傳至 OSM 伺服器。" - -#: ../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 "尚有未解決的衝突。您必須先解決那些衝突。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "沒有要上傳的項目。請先取得一些資料。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "沒有要上傳的變更。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "只同步 {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 "同步整個資料組" - -#: ../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 "偵測到衝突" - -#. 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 "未預期的回傳值。得到 {0}" - -#: ../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 "" -"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版" -"本。

請按{0}將整個本地端資料組與伺服器同步。
按" -"{1}則會放棄並繼續編輯。
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符" - -#: ../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 "上傳至 OSM API 失敗" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "是否上傳這些變更？" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "上傳變更" - -#: ../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 "在既存的路徑加入新的節點" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "提供關於您所上傳變更的簡短註解：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "地圖設定值" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -#, fuzzy -msgid "Tags of new changeset" -msgstr "變更組合" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "要加入的物件：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "要編輯的物件：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "要刪除的物件：" - -#: ../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] "要加入的物件：" - -#: ../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] "要編輯的物件：" - -#: ../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] "要刪除的物件：" - -#: ../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 "上次改變於 {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "拉近" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "拉起" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "返回" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "跳回" - -#: ../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 "音效：{0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "加速" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "加速快轉" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "快轉" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "高速快轉" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "下個標記" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "播放下一個標記。" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "播放/暫停" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "播放/暫停音效。" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "前個標記" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "播放前一個標記。" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "放慢" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "慢速快轉" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "正在下載 GPS 資料" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "已下載的 GPX 資料" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "原始 GPS 資料" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "正在下載資料" - -#: ../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 "沒有匯入資料。" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "OpenStreetMap 資料" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "下載 {0} / {1} (剩下 {2})" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "下載時發生錯誤" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "刪除模式" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "刪除節點或路徑。" - -#: ../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 "模式：{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 "" -"點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。" -"Ctrl：刪除參考的物件。" - +#: ../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 @@ -2032,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 @@ -2041,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 @@ -2071,4 +1061,872 @@ msgstr "參數「{0}」必須不為空值(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 "不能合併節點。會刪除仍在使用的路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "合併 {0} 個節點" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../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 "鏡射" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "鏡射選取的節點和路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "請選擇至少一個節點或路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "上" + +#: ../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 "移動物件 {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "下" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "左" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "右" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "移動 {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "移動物件 {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 "不能將物件移動到世界外頭" + +#: ../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 "新增" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "建立新地圖" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "開啟..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "開啟檔案" + +#: ../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 "開啟位址..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "開啟 URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "另外的圖層" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "輸入要下載的 URL：" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "下載位置" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "下載 URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "形狀直角化" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "移動節點讓所有角度成為 90 或 270 度" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "只允許兩個節點" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "選擇區域只能由路徑組成。" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "請選擇一或多個至少有四個節點的封閉路徑。" + +#: ../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 "只選取一個節點" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "直角化" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "貼上" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "從剪貼緩衝區貼上內容。" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "貼上標籤" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "將剪貼緩衝區的標籤套用到所有選取的項目上。" + +#: ../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 "偏好設定..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "開啟偏好全域設定設定頁面" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "偏好設定" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "重做" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "重做上次復原的動作。" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "圖層更名" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "同時重新命名該檔案" + +#: ../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 "反轉路徑" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "反轉所有選取路徑的方向。" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "請選擇至少一條路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "反轉路徑" + +#: ../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 "存檔" + +#: ../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 "儲存現在的資料" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "檔案 {0} 已存在。是否覆蓋？" + +#: ../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 "空的文件" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "強制儲存" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "文件沒有包含資料。" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "衝突" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "拒絕衝突項目並儲存" + +#: ../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 "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "儲存 OSM 檔案" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "儲存 GPX 檔案" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "儲存圖層" + +#: ../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 "另存檔案..." + +#: ../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 "將目前的資料儲存為新的檔案。" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "全選" + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "顯示狀態報告" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "顯示有與程式錯誤相關資訊的狀態報告" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "求助：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "狀態報告" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "複製到剪貼簿並關閉" + +#: ../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 "關閉" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "切割路徑" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "在選取的節點上切割路徑" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "不能在選取的節點上切割路徑" + +#: ../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] "選取的節點不在任何路徑上" + +#: ../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] "節點上不只有兩個路徑。請同時選取你想切割的路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "選取的節點不在同一個路徑上。" + +#: ../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] "選取的路徑未包含選取的節點。" + +#: ../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 "你必須選擇兩個以上的節點來切割一個環狀路徑" + +#: ../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 "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）" + +#: ../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 "將路徑 {0} 分割為 {1} 個部分" + +#: ../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 "切換 GPX 線條" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "繪出原始 gps 點之間的線條。" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "切換全城設定值「{0}」。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "取消黏合路徑" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "重製由多條路徑使用的節點。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "這個節點並未黏合到其他項目上。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "這些節點沒有一個黏合到其他項目上。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "這個路徑的節點沒有一個黏合到其他項目上。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "目前的選擇區域不能用於取消黏合。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "選擇其一：" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* 一個有標籤的節點，或" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* 一個用於多條路徑的節點，或" + +#: ../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 "* 一個用於多條路徑或用於那些路徑之一的節點，或" + +#: ../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 "* 一個有一或更多節點用於多條路徑的路徑，或" + +#: ../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 "* 一個路徑且其一或多個節點用於多條路徑。" + +#: ../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 "" +"注意：如果選取了路徑，這個路徑會取得取消黏合節點的最新複本並且會\n" +"選取這些新節點。否則，所有路徑會取得他們自己的複本而且所有的節點\n" +"都會被選取。" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "取消黏合節點" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "" + +#. 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "復原" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "復原最後的動作。" + +#: ../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 "取消全選" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "取消選擇所有的物件。" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "取消全選（焦點）" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "取消全選（跳出）" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "更新資料" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "從伺服器更新目前的資料圖層（重新下載資料）" + +#. 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 "" + +#: ../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 "更新選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "選擇區域是空的" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "上傳至 OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "將所有的變更上傳至 OSM 伺服器。" + +#: ../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 "沒有要上傳的項目。請先取得一些資料。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "沒有要上傳的變更。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "只同步 {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 "同步整個資料組" + +#: ../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 "偵測到衝突" + +#. 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 "未預期的回傳值。得到 {0}" + +#: ../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 "" +"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版" +"本。

請按{0}將整個本地端資料組與伺服器同步。
按" +"{1}則會放棄並繼續編輯。
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符" + +#: ../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 "上傳至 OSM API 失敗" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "" + +#: ../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 "拉近" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "拉起" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "返回" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "跳回" + +#: ../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 "音效：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "加速" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "加速快轉" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "快轉" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "高速快轉" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "下個標記" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "播放下一個標記。" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "播放/暫停" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "播放/暫停音效。" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "前個標記" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "播放前一個標記。" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "放慢" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "慢速快轉" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "正在下載 GPS 資料" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "已下載的 GPX 資料" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "原始 GPS 資料" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "正在下載資料" + +#: ../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 "沒有匯入資料。" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "OpenStreetMap 資料" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "下載 {0} / {1} (剩下 {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "下載時發生錯誤" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "刪除模式" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "刪除節點或路徑。" + +#: ../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 "模式：{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 "" +"點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。" +"Ctrl：刪除參考的物件。" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2181,18 +2039,18 @@ "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" -#: ../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 "選擇" -#: ../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" @@ -2200,17 +2058,17 @@ msgstr[0] "加入並移動虛擬新節點至{0}路徑" -#: ../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 "" @@ -2220,5 +2078,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 "" @@ -2341,7 +2199,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -#, fuzzy msgid "id:... - object with given ID (0 for new objects)" -msgstr "id：... - 具有此 ID 的物件" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 @@ -2392,41 +2249,41 @@ msgstr "搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "開始搜尋" -#: ../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 "找不到「{0}」的符合項" -#: ../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 "搜尋「{0}」的結果沒有任何項目可加入選擇區域" -#: ../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 "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" -#: ../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 "找到 {0} 個符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2439,40 +2296,40 @@ "{2}" -#: ../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 "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" -#: ../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 "未預期的記號：{0}" -#: ../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 "沒有 or 所需的引數。" -#: ../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 "沒有 not 所需的引數。" -#: ../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 "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2483,5 +2340,5 @@ "nodes:10-20" -#: ../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." @@ -2518,7 +2375,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "加入節點" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2528,52 +2385,52 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "關係：{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "改變 {0} 個物件" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "上次改變於 {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "改變關係" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "從 {1} 「{2}」移除「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "從 {1} 「{2}」移除「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, fuzzy, java-format +#, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "從 {1} 「{2}」移除「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "將 {2}「{3}」設定 {0}={1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "將 {2}「{3}」設定 {0}={1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 -#, fuzzy, java-format +#, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "將 {2}「{3}」設定 {0}={1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2642,26 +2499,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] "刪除 {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] "刪除模式" +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] "刪除 {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] "自關係中刪除" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2675,20 +2536,16 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " "from relation?" msgstr "" -"選擇區域「{0}」已用於關係「{1}」的角色 {2}。\n" -"是否自關係中刪除？" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 -#, fuzzy, java-format +#, java-format msgid "" "Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" "" msgstr "" -"選擇區域「{0}」已用於關係「{1}」。\n" -"是否自關係中刪除？" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 @@ -2699,5 +2556,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." @@ -2777,17 +2634,17 @@ #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "解決 {1} {2} 中的 {0} 標籤衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "解決 {1} {2} 中的 {0} 標籤衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 -#, fuzzy, java-format +#, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "解決 {1} {2} 中的 {0} 標籤衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2797,17 +2654,17 @@ #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for node {0}" -msgstr "解決 {0} {1} 的版本衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for way {0}" -msgstr "解決 {0} {1} 的版本衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 -#, fuzzy, java-format +#, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "解決 {0} {1} 的版本衝突" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 @@ -2945,9 +2802,9 @@ #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 -#, fuzzy, java-format +#, java-format msgid "" "Preferences file had errors.
Making backup of old one to
{0}" "
and creating a new default preference file." -msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3014,5 +2871,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 @@ -3020,22 +2877,47 @@ 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 "參數 {0} 必須 > 0 。得到 {1}。" -#: ../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 "參數「{0}」必須不為空值(null)" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "路徑「{1}」沒有有用的角色「{0}」。" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "錯誤：{0}" -#: ../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 "警告：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, fuzzy, java-format +msgid "expected id >= 0. Got {0}" +msgstr "未預期的欄位索引。得到 {0}" + +#: ../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 +#, fuzzy, java-format +msgid "id > 0 expected. Got {0}" +msgstr "未預期的記號：{0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, fuzzy, java-format +msgid "version > 0 expected. Got {0}" +msgstr "未預期的記號：{0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 @@ -3049,11 +2931,16 @@ msgstr "參數「{0}」不是可接受的類別，取得「{1}」" -#: ../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 "" @@ -3104,9 +2991,9 @@ msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}" -#: ../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." @@ -3115,118 +3002,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 "關係中已刪除的成員「{0}」。" -#: ../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 "路徑「{0}」少於兩個節點。" -#: ../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 "不明的角色「{0}」。" -#: ../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 "「{0}」的不明成員類型。" -#: ../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 "找不到限制 {0} 的樣式" -#: ../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 "路徑「{1}」沒有有用的角色「{0}」。" -#: ../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 "多邊形中有非-路徑「{0}」。" -#: ../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 "多邊形「{0}」沒有外部路徑。" -#: ../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 "路徑「{0}」和「{1}」之間的十字路。" -#: ../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 "內部路徑「{0}」在外。" -#: ../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 "內部路徑「{0}」的樣式等同多邊形。" -#: ../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 "外部路徑「{0}」的樣式不符。" -#: ../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 "文字" @@ -3249,5 +3136,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" @@ -3257,5 +3144,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" @@ -3265,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" @@ -3376,5 +3263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "鐵路" @@ -3404,129 +3291,33 @@ msgstr[0] "{0} 成員" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, fuzzy, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" -"初始化與 OSM 伺服器 {0} 的連線失敗。\n" -"請檢查您的偏好設定中的伺服器 URL 和網際網路連線。" - -#. 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 "不明" - -#: ../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." +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +msgid "Precondition violation" 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 -msgid "Precondition violation" +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 "" -#: ../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 "" @@ -3743,5 +3534,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}" @@ -4118,4 +3909,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 @@ -4184,8 +3977,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 @@ -4310,5 +4103,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 "已刪除" @@ -4368,10 +4161,10 @@ #: ../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 "否，中止" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#, fuzzy, java-format +#, java-format msgid "" "To keep your local version, JOSM
has to reset the id of primitive " @@ -4379,6 +4172,4 @@ "yo agree?" msgstr "" -"要保留您的本地端版本，JOSM
必須將 {0} {1} 的 id 重設為 0。
在下次" -"上傳時伺服器會重新分配
新的 id 給它。
您是否同意？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 @@ -4410,4 +4201,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 @@ -4421,5 +4213,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 "合併的節點尚未凍結。不能建置決議指令" @@ -4525,4 +4317,40 @@ msgstr "他們的資料組合並未包含設定鍵 {0} 的標籤" +#: ../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 "沒有待解決的標籤衝突" + +#: ../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 @@ -4535,24 +4363,23 @@ msgstr "全部" -#: ../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 "選擇一種顏色" - -#: ../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 -#, fuzzy, java-format +#: ../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 "參數「{0}」不是有效的類型名稱，取得「{1}」" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +msgstr "" + +#: ../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}''" @@ -4560,12 +4387,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "參數「{0}」必須不為空值(null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4573,12 +4400,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 -#, fuzzy +#: ../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 +msgstr "" + +#: ../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 +#: ../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 "" @@ -4589,12 +4417,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "將路徑標記為" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "自關係中刪除" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 @@ -4620,24 +4446,8 @@ msgstr[0] "{0} 關係" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "衝突的決議" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "解決衝突" - -#: ../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 "貼上" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4652,8 +4462,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} 路徑" +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 "將目前表格列中的成員自這個關係中移除" + +#: ../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 "本名" + +#: ../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 +#, fuzzy +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 "數值" + +#: ../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 +msgid "Orig. Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "重訂版本" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4680,5 +4556,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}" @@ -4709,5 +4585,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." @@ -4780,13 +4656,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 "圖層：{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 "關係：{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4871,5 +4747,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 "<不同>" @@ -4927,5 +4803,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 "加入" @@ -4975,5 +4851,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 "關係" @@ -5066,8 +4942,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] "作者" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5076,12 +4953,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -#, fuzzy msgid "Show info" -msgstr "顯示" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "更多關於這個功能的資訊" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5162,5 +5037,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}" @@ -5178,9 +5053,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 "" @@ -5431,11 +5301,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 "" @@ -5449,7 +5319,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "編輯關係" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5572,5 +5441,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "地名" @@ -5651,5 +5520,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 "" @@ -5680,17 +5549,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 -#, fuzzy, java-format +#, java-format msgid "History for node {0}" -msgstr "{0} {1} 的歷史紀錄" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 -#, fuzzy, java-format +#, java-format msgid "History for way {0}" -msgstr "{0} {1} 的歷史紀錄" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 -#, fuzzy, java-format +#, java-format msgid "History for relation {0}" -msgstr "{0} {1} 的歷史紀錄" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5699,7 +5568,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "將目前的偏好設定上傳到伺服器" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5732,17 +5600,17 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 -#, fuzzy, java-format +#, java-format msgid "id > 0 expected, got {0}" -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 -#, fuzzy, java-format +#, java-format msgid "Loading history for node {0}" -msgstr "載入歷史紀錄" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 -#, fuzzy, java-format +#, java-format msgid "Loading history for way {0}" -msgstr "載入歷史紀錄" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 @@ -6582,78 +6450,74 @@ #: 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 "名稱" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" -msgstr "" -"版本 {0} 由 {2} 建立於 {1} " +"{2} in changeset {3}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "更多關於這個功能的資訊" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "上次改變於 {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6671,7 +6535,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "街道名稱" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6712,12 +6575,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "請選擇一個數值" +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 "參數「{0}」必須不為空值(null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6758,9 +6620,10 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 #, fuzzy -msgid "Unsafed data and conflicts" -msgstr "修正標籤的衝突" +msgid "Unsaved data and conflicts" +msgstr "解決衝突" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 @@ -6774,7 +6637,8 @@ "html>" msgstr[0] "" +msgstr[1] "" #: ../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 "" @@ -6790,8 +6654,9 @@ "changes.
Layers with non-writable files:" msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 #, fuzzy -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "使用預設標籤忽略檔案。" @@ -6805,7 +6670,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "放棄修改且離開" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6818,7 +6682,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "存檔後離開" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6896,7 +6759,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 -#, fuzzy msgid "Should upload?" -msgstr "上傳時" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 @@ -6905,12 +6767,141 @@ #: ../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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "提供關於您所上傳變更的簡短註解：" + +#: ../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 "要加入的物件：" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "要編輯的物件：" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "要刪除的物件：" + +#: ../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 "上傳變更" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "檔案" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "是否上傳這些變更？" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "正在上傳" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "請輸入此位置的名稱。" + +#: ../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 @@ -7143,5 +7134,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." @@ -7198,7 +7188,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "正在下載資料" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7259,4 +7248,13 @@ msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" + +#: ../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 "" +"上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。
如果您想要上傳" +"軌跡，請看這裡：" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7436,5 +7434,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 "請選擇要刪除的列。" @@ -7886,7 +7884,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#, fuzzy msgid "Show localized name in selection lists" -msgstr "在選擇區域清單顯示物件 ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -7901,7 +7898,6 @@ #. Show localized names #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 -#, fuzzy msgid "Show localized name in selection lists, if available" -msgstr "在選擇區域清單顯示物件 ID" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -8261,8 +8257,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!" @@ -8319,5 +8311,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 @@ -8327,42 +8319,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "加入新的圖層" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "刪除選取的圖層。" - -#: ../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 "更多關於這個功能的資訊" #. 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 "額外屬性：" -#: ../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 "使用群組「{1}」的預設組合「{0}」" -#: ../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 "使用預設組合「{0}」" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "封閉路徑" -#: ../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 "不明的類型：{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 @@ -8373,15 +8363,15 @@ msgstr "無法讀取標籤預設組合來源：{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 "分析 {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 "類型 {0} 的元件已支援。" -#: ../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 @@ -8390,18 +8380,18 @@ msgstr[0] "改變 {0} 個物件" -#: ../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 "尚未選擇！" -#: ../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 "改變屬性" @@ -8428,5 +8418,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)，可能是缺少標籤。" @@ -8442,7 +8431,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 @@ -8518,5 +8504,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}" @@ -8524,5 +8510,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" @@ -8530,5 +8516,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" @@ -8549,6 +8534,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 @@ -8558,40 +8543,40 @@ msgstr "正在下載 OSM 資料..." -#: ../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 "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" -#: ../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 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#, java-format msgid "Fetching a package of relations from ''{0}''" -msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8653,10 +8638,10 @@ msgstr "使用 {1} 版協定建立與 {0} 的連線" -#: ../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 "伺服器回覆未預期的 id 格式，取得「{0}」" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8664,11 +8649,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 "正在開啓資料組合..." - -#: ../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}" @@ -8676,34 +8659,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 "正在開啓資料組合..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "正在開啓資料組合..." - -#: ../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 "正在開啓資料組合..." - -#: ../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 " @@ -8711,44 +8678,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "正在關閉資料組合..." -#: ../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 "正在關閉資料組合..." - -#: ../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 "正在開啓資料組合..." - -#: ../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 "正在準備..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "正在上傳..." -#: ../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}." @@ -8767,10 +8734,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 "OSM 伺服器檔案(bzip2 壓縮)" -#: ../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 "無效的 bz2 檔案。" @@ -8830,6 +8797,11 @@ "以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" +#: ../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 伺服器檔案" @@ -8858,5 +8830,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 "OSM 伺服器檔案(以 gzip 壓縮)" @@ -8913,74 +8885,139 @@ msgstr "分析時發生錯誤。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "不明的版本" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "OSM 資料缺少版本編號" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "缺少必要的屬性「{0}」" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "缺少必要的屬性「{0}」" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" msgstr "不明的版本：{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 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" +msgstr "缺少必要的屬性「{0}」" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr "在非-路徑中發現 元件。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "在非-關係中發現 元件。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, fuzzy, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" + +#: ../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 +#, fuzzy, java-format +msgid "Missing attribute ''ref'' on member in relation {0}" msgstr "在關係 {0} 的成員中缺少屬性「ref」" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 -#, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, fuzzy, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, fuzzy, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "在關係 {1} 的成員 {0} 中缺少屬性「type」" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" - #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "不完整的 > 規格，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 +#, fuzzy, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "不合法的物件，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 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" +msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" + +#: ../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 +#, fuzzy, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "不明的版本：{0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, fuzzy, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" +msgstr "在關係 {0} 的成員中缺少屬性「ref」" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, java-format +msgid "Missing required attribute ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, fuzzy, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" + +#: ../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 "" @@ -8989,16 +9026,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 "準備 OSM 資料..." -#: ../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 "準備 OSM 資料..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "正在準備資料..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9043,33 +9094,43 @@ msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。" -#: ../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}。正在上傳 {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}。正在上傳 {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}。正在上傳 {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 "正在上傳..." + +#: ../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 "沒有要上傳的項目。請先取得一些資料。" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9106,12 +9167,7 @@ msgstr "正在下載外掛程式 {0}..." -#: ../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 "JOSM 第 {0} 版需要外掛程式 {1}。" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 @@ -9123,4 +9179,9 @@ msgstr "略過下載" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM 第 {0} 版需要外掛程式 {1}。" + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9162,20 +9223,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 "無法載入外掛程式 {0}。是否從偏好設定中刪除？" -#: ../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 " @@ -9183,5 +9244,9 @@ msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。" -#: ../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 "" @@ -9189,19 +9254,19 @@ msgstr "發生未預期的例外，可能來自「{0}」外掛程式。" -#: ../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 "根據此外掛程式的資訊，作者是 {0}。" -#: ../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 " @@ -9209,13 +9274,13 @@ msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。" -#: ../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" @@ -9270,4 +9335,35 @@ "\n" "{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 "不明" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 @@ -9340,4 +9436,91 @@ msgstr "（該文字已複製到您的剪貼簿中。）" +#: ../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 +#, fuzzy +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 "" +"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet." +"osm" + +#: ../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 @@ -9407,5 +9590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9414,5 +9597,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9421,5 +9604,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9428,5 +9611,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9435,5 +9618,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9492,40 +9675,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}" @@ -9533,47 +9715,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 "GPX 上傳成功" -#: ../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 "正在上傳 GPX 軌跡：{0}% ({1} / {2})" -#: ../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 "沒有選取 GPX 圖層。不能上傳軌跡。" -#: ../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 "正在上傳 GPX 軌跡" @@ -9790,5 +9972,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 "將圖片與 GPX 軌跡關聯" @@ -9802,13 +9984,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 "您應該選擇一個 GPX 軌跡" -#: ../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 "沒有選取的 GPX 軌跡" -#: ../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 "" @@ -9819,9 +10001,9 @@ "預期的格式：{0}" -#: ../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 "" @@ -9832,65 +10014,65 @@ "預期的格式：{0}" -#: ../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 "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" -#: ../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 "GPX 軌跡已載入" -#: ../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 "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" -#: ../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 "GPX 軌跡沒有時刻資訊" -#: ../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 "時區：{0}" -#: ../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 "分鐘：{0}" -#: ../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 "秒鐘：{0}" -#: ../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 "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" -#: ../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 "({0} 天的時間差異)" -#: ../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 "在軌跡與相片間的補償：{0}分 {1}秒" -#: ../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 " @@ -9898,13 +10080,13 @@ msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" -#: ../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 "預設值" @@ -9942,5 +10124,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 "載入檔案有錯誤" @@ -9969,11 +10151,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, fuzzy, java-format +#, java-format msgid "" "Town/city {0} not found or not available\n" "or action canceled" msgstr "" -"城/鎮 {0} 在 WMS 中找不到或無法使用。\n" -"請在 www.cadastre.gouv.fr 中檢查它的可用性" #. this below is a temporary workaround to fix the "always on top" issue @@ -9989,13 +10169,13 @@ msgstr "選擇自..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "Cadastre" -#: ../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" @@ -10007,13 +10187,13 @@ "您是否想要回復以 F11 作為抓取動作？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "回復抓取捷徑鍵 F11" -#: ../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 "JOSM 已停止以便讓變更生效。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10123,9 +10303,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 "將「source=...」加入元件？" @@ -10235,7 +10415,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 -#, fuzzy msgid "Image cropping" -msgstr "正在載入圖片..." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 @@ -10281,7 +10460,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "選擇" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10368,5 +10546,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 "空白圖層" @@ -11304,18 +11482,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}" @@ -11326,5 +11504,5 @@ msgstr "Osmarender" -#: ../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 " @@ -11332,9 +11510,9 @@ msgstr "找不到 Firefox。請在偏好設定的地圖設定頁面設定 firefox 執行檔。" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 msgid "osmarender options" msgstr "osmarender 選項" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "Firefox executable" msgstr "Firefox 可執行檔" @@ -11345,28 +11523,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "建立新的節點。" + +#: ../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 "允許 JOSM 被其他應用程式控制的外掛程式。" -#: ../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 " @@ -11377,28 +11560,35 @@ "照了外部應用程式與此外掛程式的溝通。" -#: ../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 "遠端控制被要求自 API 下載資料。" -#: ../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 "要求的詳細資料：{0}" -#: ../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 +#, fuzzy +msgid "Remote Control has been asked to create a new node." +msgstr "遠端控制被要求自 API 下載資料。" + +#: ../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 "遠端控制被要求自下列 URL 匯入資料：" @@ -11891,25 +12081,33 @@ msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "輸入所有衝突項目的數值。" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "解決衝突" + #: ../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 "連結區域功能" @@ -11980,6 +12178,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 "驗證的錯誤" @@ -11989,10 +12187,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 "" @@ -12081,51 +12279,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 "正在上傳..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12151,14 +12363,12 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -#, fuzzy msgid "" "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." -msgstr "這會測試是否有兩條道路、鐵路或水路在同一圖層交錯，卻沒有以節點連接。" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 -#, fuzzy msgid "Crossing buildings" -msgstr "建立建築" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 @@ -12166,19 +12376,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 -#, fuzzy +#: ../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 +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12186,19 +12395,16 @@ #: ../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 "重製路徑" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 -#, fuzzy msgid "" "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "這會測試有沒有位置非常相近的節點存在。" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "建立重複的路徑" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12767,5 +12973,5 @@ msgstr "到達交會點" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "發生例外" @@ -12869,5 +13075,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 " @@ -12875,5 +13081,5 @@ msgstr "無法將整個連結或 id 與選取的服務進行比對。請再試一次。" -#: ../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 "沒有有效的 WMS URL 或 id" @@ -12891,17 +13097,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 "" @@ -12944,19 +13150,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "已指定" - -#: ../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 "WMS 圖層 ({0})，於縮放 {1} 自動下載" -#: ../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 "WMS 圖層 ({0})，於縮放 {1} 下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -12967,116 +13172,126 @@ 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 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "無效的日期" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +msgstr "" + +#: ../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 "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../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 "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../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 "WMS" -#: ../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 "開啓空白 WMS 圖層以便自檔案載入資料" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "WMS 外掛程式偏好設定" -#: ../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 "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單" -#: ../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 "WMS URL" -#: ../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 "WMS URL（預設值）" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "輸入選單名稱和 WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 msgid "Copy Selected Default(s)" -msgstr "複製預設值" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "請選擇至少一條路徑。" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 msgid "Downloader:" msgstr "下載器：" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 +msgid "Overlap tiles" +msgstr "重疊拼貼" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +#, fuzzy +msgid "% of east:" +msgstr "% 緯度：" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +#, fuzzy +msgid "% of north:" +msgstr "% 緯度：" + #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 -#, fuzzy msgid "WMS Files (*.wms)" -msgstr "TangoGPS 檔案 (*.log)" +msgstr "" #. * @@ -13458,5 +13673,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 "道路編號" @@ -14018,8 +14233,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 "租車" +msgstr "" #. color heath @@ -14037,5 +14251,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 "" @@ -14048,7 +14263,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "停車場通道" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -14084,7 +14298,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "石子路" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14095,7 +14308,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "compacted" -msgstr "不完整" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14106,7 +14318,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "grass_paver" -msgstr "草地" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14300,4 +14511,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" @@ -14326,12 +14538,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 @@ -14379,5 +14591,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14414,5 +14626,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14476,6 +14688,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 "否" @@ -14621,6 +14834,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 "類型" @@ -14891,7 +15104,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "徒步區" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14910,7 +15122,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "長釘" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15202,7 +15413,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 "經營者" @@ -15415,6 +15626,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 "海拔" @@ -16326,7 +16537,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" @@ -16374,23 +16582,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 "" @@ -16414,5 +16622,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" @@ -16459,22 +16666,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 "" @@ -16489,22 +16696,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 "" @@ -16519,22 +16726,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 "" @@ -16568,5 +16775,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 "" @@ -16586,7 +16793,6 @@ #: build/trans_presets.java:1393 -#, fuzzy msgid "Park and Ride" -msgstr "標記為完成" +msgstr "" #. item "Tourism/Information Terminal" text "Reference number" @@ -16600,7 +16806,6 @@ #. #: build/trans_presets.java:1396 -#, fuzzy msgid "Capacity (overall)" -msgstr "容量" +msgstr "" #. item "Car/Parking" text "Capacity (overall)" @@ -16610,12 +16815,10 @@ #: build/trans_presets.java:1398 -#, fuzzy msgid "Spaces for Women" -msgstr "殘障專用空間" +msgstr "" #: build/trans_presets.java:1399 -#, fuzzy msgid "Spaces for Parents" -msgstr "殘障專用空間" +msgstr "" #: build/trans_presets.java:1400 @@ -16817,5 +17020,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17200,7 +17403,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "禁止通行" +msgstr "" #. color tertiary @@ -17243,28 +17445,23 @@ #: build/trans_presets.java:1720 -#, fuzzy msgid "scheme" -msgstr "中文" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "下載區域" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "貼上" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "市" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "地方料理" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17292,7 +17489,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "登山" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17306,7 +17502,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "建築" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17323,13 +17518,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "國境管控站" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "新手" +msgstr "" #: build/trans_presets.java:1737 @@ -17346,31 +17539,26 @@ #: build/trans_presets.java:1737 -#, fuzzy msgid "plants" -msgstr "土地利用" +msgstr "" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1740 -#, fuzzy msgid "Guidepost" -msgstr "路標（徒步）" +msgstr "" #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "資訊" +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 "gps 軌跡描述" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "音效" +msgstr "" #. @@ -17381,7 +17569,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "電話號碼" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17705,5 +17892,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17737,5 +17924,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18861,6 +19048,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 "宗教" @@ -18869,66 +19056,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 "佛教" -#: 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 "基督教系" -#: 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 "印度教" -#: 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 "猶太教" -#: 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 "回教" -#: 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 "錫克教" -#: 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 "" -#: 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 "道教" -#: 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 "祆教" -#: 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 "教派" @@ -18937,76 +19124,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 "英國國教" -#: 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 "浸信會" -#: 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 "天主教" -#: 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 "福音派教會" -#: 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 "" -#: 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 "路德教派" -#: 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 "衛理公會教" -#: 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 "摩門教" -#: 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 "東正教" -#: 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 "聖靈降臨教派" -#: 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 "長老派教會" -#: 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 "新教" -#: 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 "教友派" -#: 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 "什葉派" -#: 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 "遜尼派" @@ -19338,5 +19525,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 "" @@ -19361,5 +19548,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 "硬幣" @@ -19367,5 +19554,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 "" @@ -19373,5 +19560,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 "電子錢包或收費卡" @@ -19379,5 +19566,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 "" @@ -19385,5 +19572,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 "信用卡" @@ -19442,10 +19629,144 @@ msgstr "長椅" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "返回" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "紀念碑" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "沒有" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "基本" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "顏色" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "返回" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "下" + +#. 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 "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "red" +msgstr "結束" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "數值" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "水域" + +#: build/trans_presets.java:2436 +#, fuzzy +msgid "Amount of Seats" +msgstr "線數" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "" @@ -19454,30 +19775,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 "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "噴泉" @@ -19486,10 +19807,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "編輯噴泉" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "飲水機" @@ -19498,10 +19819,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "編輯飲水機" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19509,34 +19830,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 "商店" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "超級市場" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "編輯超級市場" -#: 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 "編輯市" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "便利商店" @@ -19544,9 +19864,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "編輯便利商店" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "" @@ -19554,29 +19874,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "" -#: 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 "編輯公車站牌" - -#: 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 "編輯樹" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "自動販賣機" @@ -19584,5 +19902,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "編輯自動販賣機" @@ -19590,88 +19908,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 "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "食物" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "甜點" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "菸" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "相片" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "飼料" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "報紙" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "玩具" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "郵票" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-卡" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "" -#: 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 "保險套" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "" -#: 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 "肉類" @@ -19679,9 +19997,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "編輯肉店" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "麵包類" @@ -19689,9 +20007,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "編輯麵包店" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "花類" @@ -19699,18 +20017,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "編輯花店" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "有機產品" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "編輯有機產品商店" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "酒類" @@ -19718,54 +20036,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "編輯賣酒的商店" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "飲料類" #. 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 "電腦類" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "編輯電腦商店" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "電子材料" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "編輯電子材料行" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "編輯 Hifi 音響店" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "傢俱類" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "編輯傢俱店" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "園藝中心" @@ -19773,9 +20091,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "編輯園藝中心" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "" @@ -19783,9 +20101,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "DIY 商店" @@ -19793,54 +20111,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "編輯 DIY 商店" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "文具類" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "編輯文具店" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "美髮類" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "編輯美髮店" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "鞋類" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "編輯鞋店" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "玩具類" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "編輯玩具店" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "影片類" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "編輯影片類商店" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "乾洗類" @@ -19848,9 +20166,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "編輯乾洗店" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "洗衣店" @@ -19858,9 +20176,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "編輯洗衣店" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "戶外用品" @@ -19868,32 +20186,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "編輯戶外用品店" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "運動用品" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "編輯運動用品店" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "眼鏡類" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "編輯眼鏡行" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "現金" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "銀行" @@ -19901,14 +20219,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "編輯銀行" -#: 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 "自動提款機(ATM)" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "" @@ -19916,5 +20234,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "" @@ -19922,15 +20240,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "編輯自動提款機" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "醫師" @@ -19938,18 +20256,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "編輯醫師" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "牙醫" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "編輯牙醫" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "藥局" @@ -19957,5 +20275,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "編輯藥局" @@ -19963,9 +20281,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "配藥" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "醫院" @@ -19973,10 +20291,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "編輯醫院" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "" @@ -19985,5 +20303,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "" @@ -19992,20 +20310,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "電話號碼" #. 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 "(使用國際碼，像是 +12-345-67890)" @@ -20013,5 +20331,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 "獸醫" @@ -20020,55 +20338,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "編輯獸醫" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "縣" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "編輯縣" @@ -20076,15 +20394,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "市" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "編輯市" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "鄉/鎮" @@ -20092,10 +20410,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "編輯鄉/鎮" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "郊區" @@ -20103,25 +20421,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "編輯郊區" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "村/里" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "編輯村/里" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "" @@ -20129,5 +20447,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "" @@ -20135,10 +20453,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "島嶼" @@ -20146,24 +20464,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "編輯島嶼" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "左" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "編輯城堡" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "洞窟入口" @@ -20171,10 +20487,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "編輯洞窟入口" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "峰" @@ -20182,10 +20498,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "編輯山峰" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "冰河" @@ -20193,10 +20509,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "編輯冰河" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "火山" @@ -20204,70 +20520,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "編輯火山" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "邊界" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "國界" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "編輯國界" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "行政區" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "編輯行政區邊界" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "城市的" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "編輯城市邊界" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "政治的" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "編輯政治的邊界" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "國家公園" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "編輯國家公園" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "樹" @@ -20276,15 +20592,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "編輯樹" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "植物學名" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "" @@ -20293,5 +20609,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "" @@ -20299,17 +20615,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 "松類" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "落葉類" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "混合" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "森林" @@ -20318,14 +20634,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "編輯森林土地利用" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "自然保育" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "編輯自然保育" @@ -20333,25 +20649,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "" @@ -20359,10 +20675,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "" @@ -20370,5 +20686,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "" @@ -20376,5 +20692,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "" @@ -20383,45 +20699,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "" @@ -20429,25 +20745,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "花園" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "編輯花園" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "草地" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "" @@ -20455,10 +20771,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "" @@ -20466,20 +20782,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "" @@ -20487,5 +20803,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -20493,15 +20809,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "" @@ -20509,9 +20825,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "" @@ -20519,39 +20835,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "" @@ -20559,15 +20875,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "" @@ -20575,55 +20891,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "" @@ -20633,5 +20949,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 "" @@ -20640,10 +20956,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "" @@ -20651,5 +20967,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "" @@ -20658,5 +20974,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "" @@ -20664,34 +20980,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "" @@ -20700,15 +21016,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "" @@ -20716,5 +21032,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "" @@ -20723,5 +21039,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "" @@ -20729,5 +21045,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "" @@ -20735,5 +21051,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20799,5 +21115,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 @@ -20806,17 +21122,17 @@ msgstr "單車" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "公車" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "道路" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "渡輪" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "" @@ -20869,5 +21185,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 @@ -20876,13 +21192,13 @@ msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "健行" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "" @@ -20896,10 +21212,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "" @@ -20907,31 +21223,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "網路" #. 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 "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "" @@ -20940,30 +21256,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "" @@ -24116,76 +24432,4 @@ msgstr "" -#. 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 "" - #. color green #. @@ -25153,9 +25397,58 @@ 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 "所有的路徑都是空的" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "是否合併有不同成員的節點？" + +#~ msgid "Merge Anyway" +#~ msgstr "強制合併" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" + +#~ msgid "Unknown version" +#~ msgstr "不明的版本" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "OSM 資料缺少版本編號" + +#~ msgid "Found element in non-way." +#~ msgstr "在非-路徑中發現 元件。" + +#~ msgid "Found element in non-relation." +#~ msgstr "在非-關係中發現 元件。" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" + +#~ msgid "unnamed" +#~ msgstr "未命名的" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "提示：部分變更來自上傳到伺服器的新資料。" +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "節點中有部分(幾乎)在直線裡" + #~ msgid "Please select ways with almost right angles to orthogonalize." #~ msgstr "請選擇有近乎正確角度的路徑來做直角化。" + +#~ msgid "No document open so nothing to save." +#~ msgstr "尚未開啟文件故沒有可儲存的項目。" #~ msgid "" @@ -25164,70 +25457,4 @@ #~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。" -#~ msgid "No document open so nothing to save." -#~ msgstr "尚未開啟文件故沒有可儲存的項目。" - -#~ msgid "Delete {1} {0}" -#~ msgstr "刪除 {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "不能開啓偏好設定目錄：{0}" - -#~ msgid "nodes" -#~ msgstr "節點" - -#~ msgid "ways" -#~ msgstr "路徑" - -#~ msgid "relations" -#~ msgstr "關係" - -#~ msgid "changesets" -#~ msgstr "變更組合" - -#~ msgid "Delete Layer" -#~ msgstr "刪除圖層" - -#~ msgid "Authors: {0}" -#~ msgstr "作者：{0}" - -#~ msgid "Public" -#~ msgstr "公開" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。" - -#~ msgid "Continue anyway" -#~ msgstr "強制繼續" - -#~ msgid "Edit Information Office" -#~ msgstr "編輯資訊服務處" - -#~ msgid "Map Type" -#~ msgstr "地圖類型" - -#~ msgid "map" -#~ msgstr "地圖" - -#~ msgid "citymap" -#~ msgstr "城市地圖" - -#~ msgid "hikingmap" -#~ msgstr "健行地圖" - -#~ msgid "bicyclemap" -#~ msgstr "自行車地圖" - -#~ msgid "Board Type" -#~ msgstr "板的類型" - -#~ msgid "unnamed" -#~ msgstr "未命名的" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "節點中有部分(幾乎)在直線裡" - #~ msgid "Unknown file extension." #~ msgstr "不明的延伸檔名。" @@ -25247,7 +25474,22 @@ #~ msgstr "改變" +#~ msgid "Delete {1} {0}" +#~ msgstr "刪除 {1} {0}" + #~ msgid "Move" #~ msgstr "移動" +#~ msgid "nodes" +#~ msgstr "節點" + +#~ msgid "ways" +#~ msgstr "路徑" + +#~ msgid "relations" +#~ msgstr "關係" + +#~ msgid "changesets" +#~ msgstr "變更組合" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -25271,16 +25513,25 @@ #~ msgstr "下移" -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "將目前表格列中的成員自這個關係中移除" - #~ msgid "There were conflicts during import." #~ msgstr "匯入時有衝突項目。" +#~ msgid "Public" +#~ msgstr "公開" + #~ msgid "Aborting..." #~ msgstr "正在中止..." +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "不能開啓偏好設定目錄：{0}" + #~ msgid "Apply partial resolutions" #~ msgstr "套用部分解決方案" +#~ msgid "Delete Layer" +#~ msgstr "刪除圖層" + +#~ msgid "Authors: {0}" +#~ msgstr "作者：{0}" + #~ msgid "linked" #~ msgstr "已連結" @@ -25291,7 +25542,4 @@ #~ msgid "Remove Selected" #~ msgstr "移陳選取的" - -#~ msgid "Basic" -#~ msgstr "基本" #~ msgid "Add Selected" @@ -25377,7 +25625,13 @@ #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開" + #~ msgid "Import TCX file as GPS track" #~ msgstr "將 TCX 檔案匯入為 GPS 軌跡" +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。" + #~ msgid "Validate" #~ msgstr "檢驗" @@ -25392,15 +25646,9 @@ #~ msgstr "初始化 API 失敗。請稍後再試一次。" -#~ msgid "end" -#~ msgstr "結束" - #~ msgid "Import TCX File..." #~ msgstr "匯入 TCX 檔案..." -#~ msgid "% of lat:" -#~ msgstr "% 緯度：" - -#~ msgid "Overlap tiles" -#~ msgstr "重疊拼貼" +#~ msgid "Continue anyway" +#~ msgstr "強制繼續" #~ msgid "% of lon:" @@ -25413,4 +25661,25 @@ #~ msgstr "API 初始化失敗" +#~ msgid "Map Type" +#~ msgstr "地圖類型" + +#~ msgid "map" +#~ msgstr "地圖" + +#~ msgid "citymap" +#~ msgstr "城市地圖" + +#~ msgid "Edit Information Office" +#~ msgstr "編輯資訊服務處" + +#~ msgid "Board Type" +#~ msgstr "板的類型" + +#~ msgid "hikingmap" +#~ msgstr "健行地圖" + +#~ msgid "bicyclemap" +#~ msgstr "自行車地圖" + #~ msgid "No data" #~ msgstr "沒有資料"