Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 17707) +++ applications/editors/josm/i18n/po/ar.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 04:39+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:15+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -190,5 +190,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -671,7 +671,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "جاري تنزيل معطيات أو.أس.أم" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -742,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "إنشاء حلقة" @@ -750,9 +749,9 @@ msgstr "كوّن مستديرة من ثلاث عقد مختارة." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -763,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -916,8 +915,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "" @@ -979,5 +1056,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -985,5 +1062,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1044,65 +1121,4 @@ msgid "Please select at least two nodes to merge." msgstr "الرجاء إختيار على الأقل عقدتين للدمج." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1767,7 +1783,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "غيّر القيم ؟" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2161,7 +2176,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "الرجاء إدخال مصطلحات البحث." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2182,7 +2196,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "أضف إلى اخيار" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2349,40 +2362,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2391,5 +2404,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2525,5 +2538,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2537,5 +2550,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2579,14 +2593,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "علاقة متناقضة" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "أمحي من العلاقة" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2595,5 +2609,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2602,5 +2616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2608,5 +2622,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2616,5 +2630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2721,5 +2735,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2929,5 +2943,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2939,12 +2953,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "النص" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "مراحيض" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3048,5 +3060,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3718,7 +3730,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "المستخدِم" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4070,28 +4081,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4476,5 +4463,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4751,27 +4738,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "أضف الإختيار" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "حرّر رصيف ميناء" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "أمحي الطبقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "حرّك إلى الأعلى" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "حرّك إلى الأسفل" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4780,7 +4762,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "حرّر الفلق الخارجي" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4793,7 +4774,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "نمط المحو" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5068,14 +5048,14 @@ msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" @@ -5208,5 +5188,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6669,17 +6649,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "غيّر العلاقة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "أنشئ مساحات" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "أودع الملاحظات" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6688,7 +6665,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 @@ -6697,16 +6673,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "حمّل التغييرات" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "امحي الأغراض المختارة." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -msgid "Cancel closeing of changesets" +msgid "Cancel closing of changesets" msgstr "" @@ -6716,7 +6690,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "آخر تغيير في {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7028,7 +7002,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7051,7 +7024,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "التغييرات غير المحفوظة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7060,7 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "لا يوجد تغييرات للتحميل." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7077,12 +7048,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "حمّل التفضيلات الحالية إلى الخادم" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7294,13 +7263,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "مسلك واحد" -msgstr[1] "مسلكين" -msgstr[2] "ثلاثة مسالك" -msgstr[3] "مسالك" -msgstr[4] "مسالك" -msgstr[5] "مسالك" +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7312,12 +7277,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "الفترة الزمنية " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "الطول: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8638,7 +8601,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "المجموعة المسبقة التعريف ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8865,5 +8828,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "فشل إستيراد NMEA !" @@ -9362,22 +9325,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "جاري قراءة {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "جاري التنزيل..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "جاري قراءة {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "جاري تحميل النقاط {0} إلى {1}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10751,7 +10712,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "إحداثيات 0 " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10944,5 +10905,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11662,12 +11623,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "الرجاء إختر على الأقل طريقتين للدمج." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} عقدة" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11677,7 +11637,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} عقدة" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11686,7 +11646,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "النمط: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11695,7 +11655,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "الإصدار {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11718,5 +11678,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13433,5 +13393,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13704,5 +13664,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13878,7 +13838,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "من النوع طريق" +msgstr "" #. group "Highways" @@ -16513,7 +16472,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "النقل المشترك" +msgstr "" #. group "Transport" @@ -17332,7 +17290,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "إحفَظ" +msgstr "" #. group "Travel" @@ -17955,13 +17912,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "الحدود" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "حرّر موقفحافلة نقل جماعي (باص)" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19119,7 +19074,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "من صنع الإنسان" +msgstr "" #. group "Man-Made" @@ -25839,9 +25793,9 @@ #~ msgstr "مبيع لوازم للأنشطة رياضية" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "صفحة المساعدة مفقودة. إنشائها بِــ الإنكليزية." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 17707) +++ applications/editors/josm/i18n/po/bg.po (revision 17708) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-19 03:42+0000\n" -"Last-Translator: LandShark \n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:16+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:43+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -150,5 +150,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -192,5 +192,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -525,5 +525,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -656,13 +656,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -681,19 +679,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Затваряне на списък промени по версии..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -770,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Създаване окръжност" @@ -778,9 +773,9 @@ msgstr "Създаване на окръжност от три избрани точки" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Тези точки не са в окръжност. Излизане." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -791,5 +786,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -946,8 +941,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "Параметърът {0} не трябва да е празен" @@ -1010,5 +1083,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" "Страницата с помощ липсва. Създайте я на английски." @@ -1017,5 +1090,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1078,65 +1151,4 @@ msgid "Please select at least two nodes to merge." msgstr "Моля, изберете поне две точки за обединение." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "параметърът ''{0}'' не трябва да е празен" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1845,7 +1857,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "набори от промени" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2258,7 +2269,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Моля, въведете низ за търсене." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2279,7 +2289,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "добави към селекцията" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2423,7 +2432,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2456,5 +2465,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2462,10 +2471,10 @@ "ключ=стойност." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2474,26 +2483,26 @@ "връзка." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Неочакван знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Липсват параметри за \"ИЛИ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Липсват параметри за \"НЕ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Липсва затваряща скоба." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "Грешен брой параметри на оператора за точки." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2504,5 +2513,5 @@ "числова стойност, възел или диапазон, например, 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2637,7 +2646,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2653,5 +2662,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " @@ -2698,14 +2708,14 @@ msgstr[1] "Изтриване на {0} отношения" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Конфликтиращи релации" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Изтриване от връзка" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2716,5 +2726,5 @@ "изтрием ли от релацията?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2725,5 +2735,5 @@ "от релацията?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Разделяне пътен сегмент" @@ -2731,5 +2741,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2742,5 +2752,5 @@ "не виждате) може да ги използват.
Наистина ли искате да ги триете?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Потвърждение за изтриване" @@ -2848,6 +2858,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Разрешаване конфликтите в списъка от връзки на път {0}" @@ -3065,5 +3075,5 @@ msgstr "Списък с промени {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3075,17 +3085,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "текст" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3094,7 +3101,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3186,5 +3192,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Не е намерен примитив с id = {0} в тази база данни" @@ -3856,7 +3862,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Потребител" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4212,28 +4217,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "параметърът '{0}' не трябва да е празен" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4624,5 +4605,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4895,27 +4876,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Добавяне на избраните" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Редактирай кей" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Изтриване на моите" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Премести нагоре" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Премести надолу" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4924,7 +4900,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Отделни елементи" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4937,7 +4912,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Филтър" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5212,9 +5186,9 @@ msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Отсъедини панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5223,5 +5197,5 @@ "левия панел." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" @@ -5356,5 +5330,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6821,17 +6795,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Списък с промени {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Създаване на области" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Списък с промени {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6840,28 +6811,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Моля, изберете кои промени на параметри желаете да приложите." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Затваряне на сисъка с промени." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Затваряне на текущия списък с промени..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Затваряне на сисъка с промени." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6870,7 +6836,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Затваряне списък с промени {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7182,7 +7148,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "качва всички промени в една заявка" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7199,27 +7164,22 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Използване на нов списък с промени. Остава отворен." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Няма отворен сисък с промени." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Качване в нов или в съществуващ списък с промени?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Няма промени за качване." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7236,17 +7196,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Качете текущите параметри на сървъра" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Затваряне на текущия списък с промени..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7449,9 +7407,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} следа, " -msgstr[1] "{0} следи, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7463,12 +7421,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Времеви интервал: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Дължина: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8845,7 +8801,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Използване шаблон ''{0}'' от група ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8870,7 +8826,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9074,5 +9030,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Грешка при NMEA импортиране!" @@ -9123,7 +9079,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "параметърът {0} трябва да е > 0. Сега е {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9265,7 +9221,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Затваряне на списък промени по версии..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9576,22 +9531,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Създаване на списък с промени ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Затваряне на списък промени по версии..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Списъкът с промени {0} се оставя отворен ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Затваряне списък с промени {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9631,7 +9584,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Използване шаблон ''{0}'' от група ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -11037,7 +10990,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Запазване на техните координати" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11239,5 +11192,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "неуспешно внасяне от TangoGPS!" @@ -11975,23 +11928,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} точка" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Промени {0} {1}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} точка" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12000,7 +11951,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Добавяне на път {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12009,12 +11960,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Версия {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Версия {0} създадена на {1} от {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12032,5 +11983,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13802,5 +13753,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14099,5 +14050,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14296,7 +14247,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "път / магистрала" +msgstr "" #. group "Highways" @@ -16931,7 +16881,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Обществен транспорт" +msgstr "" #. group "Transport" @@ -17750,7 +17699,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "чакъл" +msgstr "" #. group "Travel" @@ -18373,13 +18321,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Граници" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Редактиране на книжарница" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19537,7 +19483,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Изкуствени" +msgstr "" #. group "Man-Made" @@ -21032,7 +20977,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geographic" +msgstr "" #. group "Places" @@ -26111,24 +26055,6 @@ msgstr "" -#~ msgid "Close current changeset" -#~ msgstr "Затваряне на текущия списък с промени" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Няма отворен сисък с промени." - -#~ msgid "- running version is {0}" -#~ msgstr "- изпълняващата се версия е {0}" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Използване на нов списък с промени и затваряне" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "" -#~ "Използване на съществуващия списък с промени {0}. След качване се затваря." - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "" -#~ "Използване на съществуващия списък с промени {0}. След качване остава " -#~ "отворен." +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "параметърът '{0}' не трябва да е празен" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -26626,10 +26552,13 @@ #~ msgstr "Редактирай падаща решетка" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "- running version is {0}" +#~ msgstr "- изпълняващата се версия е {0}" + +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" #~ "Липсва страница с помощ. Създайте я на английски." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26754,4 +26683,22 @@ #~ msgstr "връзки" +#~ msgid "There is currently no changeset open." +#~ msgstr "Няма отворен сисък с промени." + +#~ msgid "Close current changeset" +#~ msgstr "Затваряне на текущия списък с промени" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Използване на нов списък с промени и затваряне" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "" +#~ "Използване на съществуващия списък с промени {0}. След качване се затваря." + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "" +#~ "Използване на съществуващия списък с промени {0}. След качване остава " +#~ "отворен." + #~ msgid "No currently open changeset. Opening a new changeset..." #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..." Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 17707) +++ applications/editors/josm/i18n/po/cs.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 15:02+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:06+0000\n" "Last-Translator: Martin Petricek \n" "Language-Team: Czech \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -190,5 +190,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -517,5 +517,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -648,13 +648,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -673,19 +671,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Zavírám sadu změn..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -758,5 +753,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Vytvořit kruh" @@ -766,9 +761,9 @@ msgstr "Vytvořit kruh ze tří uzlů" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Tyto body nejsou v kruhu. Přerušuji." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -780,5 +775,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -933,8 +928,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parametr ''{0}'' nesmí být null" @@ -998,5 +1071,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." @@ -1004,5 +1077,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1065,65 +1138,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' nesmí být null" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1817,7 +1829,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Informace o sadě změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2229,7 +2240,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Zadjte hledaný řetězec." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2250,7 +2260,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "přidat k výběru" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2393,7 +2402,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2425,40 +2434,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, 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:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Neočekávaný token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Chybějící argument pro \"NEBO\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Chybějící argument pro \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Očekávám uzavírací závorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2469,5 +2478,5 @@ "čísel, například nodes:10-20." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2601,7 +2610,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2617,5 +2626,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" @@ -2663,14 +2673,14 @@ msgstr[2] "Smazat {0} relací" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Konfliktní relace" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Odstranit z relace" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2681,5 +2691,5 @@ "relace?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2689,5 +2699,5 @@ "Výběr \"{0}\" je použit v relaci \"{1}\".
Smazat z relace?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Rozdělit segment cesty" @@ -2695,5 +2705,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2706,5 +2716,5 @@ "
Opravdu je chcete smazat?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Potvrďte smazání" @@ -2814,6 +2824,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Vyřešení konfliktů v seznamu uzlů cesty {0}" @@ -3025,5 +3035,5 @@ msgstr "Sada změn {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3035,17 +3045,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "text" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3054,7 +3061,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3146,5 +3152,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "V této datové sadě nelze nalézt prvek s id {0}" @@ -3822,7 +3828,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Uživatel" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4188,28 +4193,4 @@ msgstr[1] "Cizí verze ({0} položky)" msgstr[2] "Cizí verze ({0} položek)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parametr '{0}' nesmí být null (prázdný)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4602,5 +4583,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Klíč ''{0}'' a všechny jeho hodnoty budou odstraněny" @@ -4878,27 +4859,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Přidat vybrané" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Upravit molo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Smazat vrstvu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Posunout nahoru" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Posunout dolů" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4907,7 +4883,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Jednotlivé prvky" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4920,7 +4895,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filtrovat" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5197,9 +5171,9 @@ msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Vytrhnout panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5208,5 +5182,5 @@ "nástrojů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Minimalizovat nebo maximalizovat obsah panelu" @@ -5343,5 +5317,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6819,17 +6793,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Informace o sadě změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Vytvořit plochy" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Informace o sadě změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6838,28 +6809,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Prosím vyberte které změny vlastností chcete použít." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Uzavírám sadu změn" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Uzavřít aktuální sadu změn ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Uzavírám sadu změn" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6868,7 +6834,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Uzavírám sadu změn {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6896,19 +6862,19 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "Vrstva ''{0}'' nemá změny k nahrání na server" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 -#, fuzzy, java-format +#, java-format msgid "" "Layer ''{0}'' has modifications which should be saved to its associated file " "''{1}''." -msgstr "Vrstva ''{0}'' má změny, které by měly být uloženy do souboru ''{1}''." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "Vrstva ''{0}'' nemá změny k uložení" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 @@ -7187,7 +7153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Nahrát všechny změny v jednom požadavku" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7204,32 +7169,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Tagy nové sady změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Použít novou sadu změn a ponechat ji otevřenou" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Žádná otevřená sada změn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Nahrát do nové nebo do existující sady změn?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Žádné změny k nahrání." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next upload" -msgstr "Vloží data do již existující sady změn {0} a následně ji uzavře" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 @@ -7242,17 +7201,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Znovu nahrát historii ze serveru" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Smazat vybrané značky" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "očekáváno child.getId() >0. Nalezeno {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7456,10 +7413,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} cest, " -msgstr[1] "{0} cesta, " -msgstr[2] "{0} cesty, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7471,12 +7427,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Časové rozpětí: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Délka: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8801,7 +8755,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8826,7 +8780,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9033,5 +8987,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA import selhal!" @@ -9083,7 +9037,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "požadován parametr {0} > 0. Zadáno {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9140,7 +9094,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 -#, fuzzy, java-format +#, java-format msgid "Changeset id > 0 expected. Got {0}" -msgstr "očekáváno id > 0. Nalezeno {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 @@ -9172,7 +9126,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "Chybějící povinný atribut ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9181,17 +9135,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9225,7 +9179,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Zavírám sadu změn..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9548,22 +9501,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Vytvářím sadu změn..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Zavírám sadu změn..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Nechávám sadu změn {0} otevřenou..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Uzavírám sadu změn {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9604,7 +9555,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Chybějící povinný atribut ''{0}'' XML elementu {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9612,7 +9563,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" -msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11005,7 +10956,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Ponechat cizí souřadnice" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11208,5 +11159,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Import TangoGPS selhal!" @@ -11941,22 +11892,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} uzel" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Změnit {0} {1}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} uzel" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11965,7 +11915,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Přidat cestu {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11974,12 +11924,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Verze {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Verze {0} vytvořená na {1} uživatelem {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11997,9 +11947,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"Plugin openstreetbus používá starý server na appspot.com.
Nový " +"Plugin openstreetbugs používá starý server na appspot.com.
Nový " "server je dostupný na schokokeks.org.
Chcete změnit nastavení serveru na " "nový? (Velice doporučujeme)" @@ -13773,5 +13723,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14063,5 +14013,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14255,7 +14205,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "silnice" +msgstr "" #. group "Highways" @@ -16890,7 +16839,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Hromadná doprava" +msgstr "" #. group "Transport" @@ -17709,7 +17657,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "štěrk" +msgstr "" #. group "Travel" @@ -18332,13 +18279,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Hranice" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Upravit knihkupectví" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19496,7 +19441,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Umělé konstrukce" +msgstr "" #. group "Man-Made" @@ -20991,7 +20935,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geographic" +msgstr "" #. group "Places" @@ -26070,31 +26013,6 @@ msgstr "Český UHUL:ORTOFOTO" -#~ msgid "Close current changeset" -#~ msgstr "Uzavřít aktuální sadu změn" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Aktuálně není otevřena žádná sada změn." - -#~ msgid "- running version is {0}" -#~ msgstr "- běžící verze je {0}" - -#~ msgid "not yet decided" -#~ msgstr "zatím nerozhodnoto" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Použít novou sadu změn a uzavřít ji" - -#~ 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í" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "Použít existující sadu změn {0} a ponechat ji otevřenou" - -#~ 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" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parametr '{0}' nesmí být null (prázdný)" #~ msgid "Email" @@ -26481,10 +26399,10 @@ #~ msgstr "cyklistická mapa" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" #~ "Stránka s nápovědou chybí. Udělej jí v angličtině." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26501,4 +26419,7 @@ #~ msgid "The projection could not be read from preferences. Using EPSG:4326" #~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" + +#~ msgid "- running version is {0}" +#~ msgstr "- běžící verze je {0}" #~ msgid "Edit Information Office" @@ -26639,2 +26560,27 @@ #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Mazání vrstvy {0} z {1}" + +#~ 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í" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "Použít existující sadu změn {0} a ponechat ji otevřenou" + +#~ 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" + +#~ msgid "Close current changeset" +#~ msgstr "Uzavřít aktuální sadu změn" + +#~ msgid "There is currently no changeset open." +#~ msgstr "Aktuálně není otevřena žádná sada změn." + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Použít novou sadu změn a uzavřít ji" + +#~ msgid "not yet decided" +#~ msgstr "zatím nerozhodnoto" Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 17707) +++ applications/editors/josm/i18n/po/da.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 03:13+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:08+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -514,5 +514,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -642,13 +642,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -667,19 +665,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Lukker rettesæt..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -756,5 +751,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Opret cirkel" @@ -764,9 +759,9 @@ msgstr "Opret cirkel ud fra tre valgte punkter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Punkterne er ikke i en cirkel. Afbryder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -779,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -932,9 +927,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "parameter \"{0}\" må ikke være null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parameteren \"{0}\" må ikke være en null-værdi" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -995,5 +1068,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Hjælpesiden mangler. Opret den på engelsk" @@ -1001,5 +1074,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1062,65 +1135,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameteren \"{0}\" må ikke være en null-værdi" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1795,7 +1807,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "rettesæt" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2196,7 +2207,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Indtast en søgetekst." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2217,7 +2227,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "føj til valgte" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2356,7 +2365,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2389,40 +2398,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Mangler argumenter for \"eller\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Mangler argument fro \"ikke\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Forventede slutparentes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2431,5 +2440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2564,5 +2573,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2576,5 +2585,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2618,14 +2628,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Modstridende relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Slet fra relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2634,5 +2644,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2641,5 +2651,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Opdel vejstykke" @@ -2647,5 +2657,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2658,5 +2668,5 @@ "måske bruger dem.
Vil du virkelig slette?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2762,6 +2772,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Løs konflikter i punktlisten for vejen {0}" @@ -2973,5 +2983,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2983,17 +2993,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "tekst" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "Versalfølsom" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "Ikke-versalfølsom" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3002,7 +3009,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "Regulært udtryk" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3094,5 +3100,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Fandt ikke en primitiv med id {0} i dette datasæt" @@ -3755,7 +3761,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Bruger" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4108,28 +4113,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4516,5 +4497,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4789,27 +4770,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Tilføj valgte" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Ret mole" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Slet mine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Flyt op" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Flyt ned" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4818,7 +4794,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Enkelte elementer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4831,7 +4806,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5106,14 +5080,14 @@ msgstr "Valgt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Frigør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Klik for at minimere/maksimere panelet" @@ -5246,5 +5220,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6711,17 +6685,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "rettesæt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Opret områder" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Indsend kommentar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6730,28 +6701,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Lukker rettesæt" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Luk det nuværende rettesæt ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Lukker rettesæt" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6760,7 +6726,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Lukker rettesæt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7072,7 +7038,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Send alle ændringer til OSM-serveren." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7087,7 +7052,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7096,7 +7060,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Intet rettesæt åbent" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7105,7 +7068,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Ingen ændringer at sende." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7122,17 +7084,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Send de nuværende indstillinger til serveren" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Luk det nuværende rettesæt ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7335,9 +7295,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} spor, " -msgstr[1] "{0} spor, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7349,12 +7309,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Tidshorisont: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Længde: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8679,7 +8637,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8704,7 +8662,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\"" +msgstr "" #. SAXException does not chain correctly @@ -8908,5 +8866,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Fejl ved NMEAimport!" @@ -9097,7 +9055,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Lukker rettesæt..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9408,22 +9365,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Lukker rettesæt..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Lukker rettesæt..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Indlæser {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Henter udvidelsen {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9463,7 +9418,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10843,7 +10798,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Behold deres koordinater" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11036,5 +10991,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11755,12 +11710,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} punkt" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11770,7 +11724,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} punkt" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11779,7 +11733,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Tilstand: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11788,7 +11742,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Version {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11811,5 +11765,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13543,5 +13497,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13826,5 +13780,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14007,7 +13961,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "landevej" +msgstr "" #. group "Highways" @@ -16642,7 +16595,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Offentlig transport" +msgstr "" #. group "Transport" @@ -17461,7 +17413,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "grus" +msgstr "" #. group "Travel" @@ -18084,13 +18035,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Grænser" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Ret busstop" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19248,7 +19197,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Menneskeskabt" +msgstr "" #. group "Man-Made" @@ -25820,13 +25768,4 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" - -#~ msgid "Close current changeset" -#~ msgstr "Luk nuværende rettesæt" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Der er ingen rettesæt åbne." - -#~ msgid "- running version is {0}" -#~ msgstr "- nuværende version er {0}" #~ msgid "Move" @@ -26208,9 +26147,9 @@ #~ "billedet." -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjælpesiden mangler. Opret den på ." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26224,4 +26163,7 @@ #~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et " #~ "datalag?" + +#~ msgid "- running version is {0}" +#~ msgstr "- nuværende version er {0}" #~ msgid "" @@ -26333,2 +26275,8 @@ #~ msgid "No data" #~ msgstr "Intet data" + +#~ msgid "Close current changeset" +#~ msgstr "Luk nuværende rettesæt" + +#~ msgid "There is currently no changeset open." +#~ msgstr "Der er ingen rettesæt åbne." Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 17707) +++ applications/editors/josm/i18n/po/de.po (revision 17708) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-19 10:37+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-20 08:00+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -154,5 +154,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -196,5 +196,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -532,5 +532,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -665,13 +665,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Kein offener Änderungssatz" +msgstr "Offene Änderungssätze schließen" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Kein offener Änderungssatz" +msgstr "Schließt offene Änderungssätze" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -690,19 +688,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Kein offener Änderungssatz" +msgstr "Es existieren keine offenen Änderungssätze" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Kein offener Änderungssatz" +msgstr "Keine offenen Änderungssätze" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Änderungssatz schließen..." +msgstr "Offene Änderungssätze herunterladen..." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -779,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Kreis erstellen" @@ -787,9 +782,9 @@ msgstr "Einen Kreis aus drei ausgewählten Knoten erstellen." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Diese Knoten sind nicht in einem Kreis angeordnet. Abbruch." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -802,5 +797,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -955,9 +950,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "Parameter ''{0}'' darf nicht null sein" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "Parameter \"{0}\" darf nicht NULL sein" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1019,5 +1092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Hilfeseite fehlt. In englischer Sprache erstellen." @@ -1025,5 +1098,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1086,65 +1159,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "Parameter \"{0}\" darf nicht NULL sein" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1373,5 +1385,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 msgid "Rename layer" -msgstr "Ebene umbennen" +msgstr "Ebene umbenennen" #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 @@ -1603,5 +1615,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." -msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten." +msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1855,7 +1867,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Informationen zum Änderungssatz" +msgstr "Änderungssatz geschlossen" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2274,7 +2285,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Bitte einen Suchbegriff eingeben." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2295,7 +2305,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "zur Auswahl hinzufügen" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2445,7 +2454,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2477,15 +2486,15 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 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:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, 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:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2494,26 +2503,26 @@ "\"relation\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Unerwartete Daten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Fehlendes Argument für 'OR'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Fehlendes Argument für 'NICHT'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Schließende Klammer erwartet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2524,5 +2533,5 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2657,7 +2666,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2673,5 +2682,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " @@ -2717,14 +2727,14 @@ msgstr[1] "{0} Relationen löschen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Konflikt mit Relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Aus der Relation entfernen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2735,5 +2745,5 @@ "verwendet.
Aus Relation entfernen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2744,5 +2754,5 @@ "Relation entfernen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Wegabschnitt aufspalten" @@ -2750,5 +2760,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2761,5 +2771,5 @@ "diese verwenden.
Wollen Sie die Knoten wirklich löschen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Löschbestätigung" @@ -2867,6 +2877,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Konflikte in Knotenliste des Weges {0} auflösen" @@ -3099,5 +3109,5 @@ msgstr "Änderungssatz {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3109,17 +3119,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" msgstr "Text" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3128,7 +3135,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3227,5 +3233,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden" @@ -3907,7 +3913,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Nutzer" +msgstr "Nutzer:" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4282,28 +4287,4 @@ msgstr[0] "Deren Version ({0} Eintrag)" msgstr[1] "Deren Version ({0} Einträge)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "Parameter \"{0}\" darf nicht NULL sein." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4708,5 +4689,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Der Schlüssel \"{0}\" und alle dazugehörigen Werte werden entfernt" @@ -4725,8 +4706,10 @@ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" msgstr "" +"Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. " +"Erhaltener Wert {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 msgid "tag collection doesn't include the selected value ''{0}''" -msgstr "" +msgstr "Merkmalssammlung enthält nicht den gewählten Wert \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 @@ -4800,5 +4783,5 @@ #, java-format msgid "pos {0} is out of range. current number of members: {1}" -msgstr "" +msgstr "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 @@ -4993,22 +4976,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Anlegestelle (Pier) bearbeiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Ebene löschen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Nach oben verschieben" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Nach unten verschieben" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -5017,7 +4996,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Einzelne Elemente" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -5030,7 +5008,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5309,9 +5286,9 @@ msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Ansicht separat darstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5320,5 +5297,5 @@ "Werkzeugleiste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" @@ -5460,5 +5437,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -5858,5 +5835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214 msgid "Enter a place name to search for:" -msgstr "Bitte einen Ortsnamen eingeben, nach dem gesucht werden soll:" +msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll:" #. group "Geography" @@ -5930,5 +5907,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251 msgid "near" -msgstr "bei" +msgstr "In der Nähe von" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 @@ -5943,4 +5920,8 @@ "Hold left mousebutton and draw a frame." msgstr "" +"Zoomen: Mausrad, Doppelklick oder Strg + Hoch/Runter Karte " +"verschieben: Rechte Maustaste gedrückt halten und Maus bewegen oder " +"Pfeiltasten verwenden. Auswählen: Linke Maustaste gedrückt halten und " +"Rahmen aufziehen." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -6965,17 +6946,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Informationen zum Änderungssatz" +msgstr "Änderungssatznummer:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Gebiete erstellen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Informationen zum Änderungssatz" +msgstr "Änderungssatzkommentar:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6984,28 +6962,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Kein offener Änderungssatz" +msgstr "Änderungssätze öffnen" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Änderungssatz schließen" +msgstr "Änderungssätze schließen" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Den aktuelle Änderungssatz schließen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Änderungssatz schließen" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -7014,7 +6987,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Änderungssatz {0} schließen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7044,21 +7017,19 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Hochladen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 -#, fuzzy, java-format +#, java-format msgid "" "Layer ''{0}'' has modifications which should be saved to its associated file " "''{1}''." msgstr "" -"Ebene \"{0}\" enthält Modifikationen, die zum Server hochgeladen werden " -"sollen." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Speichern" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 @@ -7073,5 +7044,5 @@ #, java-format msgid "Layer ''{0}'' is not backed by a file" -msgstr "" +msgstr "Ebene \"{0}\" ist mit keiner Datei verknüpft" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -7114,5 +7085,9 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" +"{0} Ebene enthält Konflikte.
Lösen Sie diese zuerst auf oder " +"verwerfen Sie die Änderungen.
Ebene mit Konflikten:" msgstr[1] "" +"{0} Ebenen enthalten Konflikte.
Lösen Sie diese zuerst auf oder " +"verwerfen Sie die Änderungen.
Ebenen mit Konflikten:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 @@ -7130,5 +7105,11 @@ "html>" msgstr[0] "" +"{0} Ebene soll gespeichert werden, ist aber mit keiner Datei verknüpft." +"
Wählen Sie eine Datei für diese Ebene oder verwerfen Sie die Änderungen." +"
Ebene ohne verknüpfte Datei:" msgstr[1] "" +"{0} Ebenen sollen gespeichert werden, sind aber mit keiner Datei " +"verknüpft.
Wählen Sie Dateien für die Ebenen oder verwerfen Sie die " +"Änderungen.
Ebenen ohne verknüpfte Dateien:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 @@ -7346,7 +7327,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Alle Änderungen mit einer Anfrage hochladen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7363,34 +7343,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Merkmale des neuen Änderungssatzes" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Neuen Änderungssatz erstellen und geöffnet lassen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Kein offener Änderungssatz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "In einem neuen oder vorhandenen Änderungssatz hochladen?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Keine Änderungen zum Hochladen vorhanden." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next upload" msgstr "" -"Auswählen, um in einen neuen Änderungssatz hochzuladen und den Änderungssatz " -"dann zu schließen" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 @@ -7403,17 +7375,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Geschichte erneut vom Server laden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Die ausgewählten Merkmale löschen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7616,9 +7586,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} GPS-Spur, " -msgstr[1] "{0} GPS-Spuren, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7630,12 +7600,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Zeitspanne: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Länge: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8201,5 +8169,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149 msgid "Draw a circle form HDOP value." -msgstr "" +msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 @@ -8316,5 +8284,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57 msgid "Draw boundaries of downloaded data" -msgstr "Zeichne Grenzen der geladenen Daten" +msgstr "Begrenzung der heruntergeladenen Daten zeichnen" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58 @@ -8332,5 +8300,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82 msgid "Draw lines between raw GPS points" -msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten" +msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 @@ -8940,5 +8908,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 msgid "Delete the selection in the tag table" -msgstr "" +msgstr "Auswahl in der Merkmalstabelle löschen" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427 @@ -9015,7 +8983,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -9040,7 +9008,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9246,5 +9214,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA-Einlesen fehlgeschlagen!" @@ -9297,7 +9265,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9354,7 +9322,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 -#, fuzzy, java-format +#, java-format msgid "Changeset id > 0 expected. Got {0}" -msgstr "ID >= 0 erwartet, jedoch {0} erhalten." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 @@ -9386,7 +9354,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "notwendiges Attribut \"{0}\" fehlt" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9395,17 +9363,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" -msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" -msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" -msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9413,5 +9381,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}" -msgstr "" +msgstr "Fehlendes obligatorisches Attribut \"{0}\" des XML-Elements {1}" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163 @@ -9419,5 +9387,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}''" -msgstr "" +msgstr "Fehlendes obligatorisches Attribut \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 @@ -9439,7 +9407,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Änderungssatz schließen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9609,4 +9576,6 @@ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''" msgstr "" +"Fehlendes obligatorisches Attribut des \"bounds\"-Elements. Eingelesen wurde " +"minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 @@ -9617,5 +9586,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}" -msgstr "" +msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf des Wegs {1}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 @@ -9628,4 +9597,6 @@ msgid "Found XML element not as direct child of element " msgstr "" +"XML-Element wurde nicht als direktes Kind des Elements " +"gefunden" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 @@ -9784,22 +9755,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Änderungssatz erstellen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Änderungssatz schließen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Änderungssatz {0} geöffnet lassen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Änderungssatz {0} schließen..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9841,7 +9810,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9849,7 +9818,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" -msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11061,5 +11030,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Draw boundaries of downloaded data." -msgstr "Grenzenlinien der heruntergeladenen Daten zeichnen" +msgstr "Begrenzung der heruntergeladenen Daten zeichnen." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 @@ -11333,7 +11302,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Lambertkoordinaten eingeben" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11538,5 +11507,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Fehler beim TangoGPS-Import!" @@ -12274,23 +12243,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} Knoten" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "{0} {1} ändern" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} Knoten" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12299,7 +12266,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Weg {0} hinzufügen" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12308,12 +12275,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Version {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Version {0} erzeugt am {1} von {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12331,5 +12298,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -14148,5 +14115,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14455,5 +14422,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14657,7 +14624,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "Straße" +msgstr "" #. group "Highways" @@ -17292,7 +17258,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Öffentliche Verkehrsmittel" +msgstr "" #. group "Transport" @@ -18111,7 +18076,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Schotter" +msgstr "" #. group "Travel" @@ -18734,13 +18698,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Grenzen" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Buchhandlung bearbeiten" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19898,7 +19860,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Zivilisationsbauten" +msgstr "" #. group "Man-Made" @@ -21393,7 +21354,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geografisch" +msgstr "" #. group "Places" @@ -26472,35 +26432,251 @@ msgstr "Tschechien UHUL:ORTOFOTO" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "Parameter \"{0}\" darf nicht NULL sein." + +#~ msgid "All the ways were empty" +#~ msgstr "Alle Wege sind leer" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions " +#~ "for no layer.\"" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." + +#~ msgid "Found element in non-way." +#~ msgstr "Ein Element in einem Nicht-Weg gefunden." + +#~ msgid " has zero ref" +#~ msgstr " hat Null ref" + +#~ 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 "Unknown version" +#~ msgstr "Unbekannte Version" + +#~ msgid "Delete {1} {0}" +#~ msgstr "{1} {0} löschen" + +#~ 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?" + +#~ msgid "Found element in non-relation." +#~ msgstr "-Schlüssel bei einer Nicht-Relation gefunden." + +#~ msgid "Ill-formed node id" +#~ msgstr "Falsch formatierte Knoten-ID" + +#~ 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 "Merge Anyway" +#~ msgstr "Trotzdem vereinen" + +#~ 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 "- running version is {0}" +#~ msgstr "- aktive Version ist {0}" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Fehlende Versionsnummer in OSM-Daten" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "" +#~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " +#~ "Relation {1}" + +#~ 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 "Remove relation member {0} {1}" +#~ msgstr "Relationselement {0} {1} entfernen" + +#~ msgid "" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" +#~ msgstr "" +#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " +#~ "Ausnahme war: {0}" + +#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +#~ msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds" + +#~ msgid "" +#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +#~ msgstr "" +#~ "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet" +#~ "()" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() " +#~ "gefunden." + +#~ 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 "" +#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" +#~ msgstr "" +#~ "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 "" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" +#~ msgstr "" +#~ "Warnung: \"Bitte-Warten\"-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 "" +#~ "Warning: failed to put history browser always on top. Exception was: {0}" +#~ msgstr "" +#~ "Warnung: Dialog für die Geschichte von Elementen konnte nicht in den " +#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" + +#~ 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 "Close current changeset" #~ msgstr "Aktuellen Änderungssatz schließen" +#~ msgid "Use a new changeset and close it" +#~ msgstr "Neuen Änderungssatz erstellen und danach schließen" + #~ msgid "There is currently no changeset open." #~ msgstr "Es gibt momentan keinen offenen Änderungssatz." - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "Parameter \"{0}\" darf nucht Null sein." - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "Nicht unterstützter Wert \"{0}\" oder Parameter \"{1}\"." - -#~ msgid "- running version is {0}" -#~ msgstr "- aktive Version ist {0}" - -#~ msgid "not yet decided" -#~ msgstr "Noch ohne Lösung" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Neuen Änderungssatz erstellen und danach schließen" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den " -#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "" -#~ "Vorhandenen Änderungssatz {0} verwenden und nach dem Hochladen schließen" #~ msgid "" @@ -26513,11 +26689,4 @@ #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "Vorhandenen Änderungssatz {0} verwenden und geöffnet lassen" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den " -#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" #~ msgid "Changeset {0} is unchanged. Skipping update." @@ -26532,234 +26701,28 @@ #~ "ist 0." -#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" -#~ msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds" - #~ msgid "" -#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +#~ "Select to upload to the existing changeset {0} and to leave the changeset " +#~ "open for further uploads" #~ msgstr "" -#~ "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet" -#~ "()" +#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den " +#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "" +#~ "Vorhandenen Änderungssatz {0} verwenden und nach dem Hochladen schließen" #~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" -#~ "Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() " -#~ "gefunden." - -#~ msgid "All the ways were empty" -#~ msgstr "Alle Wege sind leer" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions " -#~ "for no layer.\"" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." - -#~ msgid "Found element in non-way." -#~ msgstr "Ein Element in einem Nicht-Weg gefunden." - -#~ msgid " has zero ref" -#~ msgstr " hat Null ref" - -#~ 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 "Unknown version" -#~ msgstr "Unbekannte Version" - -#~ msgid "Delete {1} {0}" -#~ msgstr "{1} {0} löschen" - -#~ 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?" - -#~ msgid "Found element in non-relation." -#~ msgstr "-Schlüssel bei einer Nicht-Relation gefunden." - -#~ msgid "Ill-formed node id" -#~ msgstr "Falsch formatierte Knoten-ID" - -#~ 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 "Merge Anyway" -#~ msgstr "Trotzdem vereinen" - -#~ 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 "Version number missing from OSM data" -#~ msgstr "Fehlende Versionsnummer in OSM-Daten" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "" -#~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " -#~ "Relation {1}" - -#~ 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 "Remove relation member {0} {1}" -#~ msgstr "Relationselement {0} {1} entfernen" - -#~ 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 "" -#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" -#~ msgstr "" -#~ "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 "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " -#~ "was: {0}" -#~ msgstr "" -#~ "Warnung: \"Bitte-Warten\"-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 "" -#~ "Warning: failed to put history browser always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für die Geschichte von Elementen konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ 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" +#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den " +#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "Nicht unterstützter Wert \"{0}\" oder Parameter \"{1}\"." + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "Parameter \"{0}\" darf nucht Null sein." + +#~ msgid "not yet decided" +#~ msgstr "Noch ohne Lösung" Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 17707) +++ applications/editors/josm/i18n/po/el.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 07:45+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:03+0000\n" "Last-Translator: logictheo \n" "Language-Team: Greek \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -512,5 +512,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -639,13 +639,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -664,19 +662,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -747,5 +742,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Δημιουργλια Κύκλου" @@ -755,9 +750,9 @@ msgstr "Δημιουργία κύκλου από τρείς επιλεγμένους κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -768,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -922,8 +917,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "" @@ -986,5 +1059,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -992,5 +1065,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1051,65 +1124,4 @@ msgid "Please select at least two nodes to merge." msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1782,7 +1794,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Αλλαγή τιμών;" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2186,7 +2197,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2207,7 +2217,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "προσθήκη στην επιλογή" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2347,7 +2356,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2376,40 +2385,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Αναμενόταν κλείσιμο παρένθεσης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2418,5 +2427,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2551,5 +2560,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2563,5 +2572,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2605,14 +2615,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Αντικρουόμενη σχέση" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Διαγραφή από σχέση" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2621,5 +2631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2628,5 +2638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2634,5 +2644,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2645,5 +2655,5 @@ "μπορεί να τους χρησιμοποιούν.
Είστε σίγουροι οτι επιθυμείτε διαγραφή;" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2750,5 +2760,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2958,5 +2968,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2968,17 +2978,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "κείμενο" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -2987,7 +2994,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3079,5 +3085,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3744,7 +3750,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Χρήστης" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4099,28 +4104,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4505,5 +4486,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4778,27 +4759,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Προσθήκη επιλεγμένων" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Επεξεργασία Αποβάθρας" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Διαγραφή Επιπέδου" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Μετακίνηση πάνω" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Μετακίνηση Κάτω" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4807,7 +4783,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Μεμονομένα στοιχεία" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4820,7 +4795,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Φίλτρο" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5096,9 +5070,9 @@ msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5107,5 +5081,5 @@ "αριστερή εργαλειοθήκη." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5239,5 +5213,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6705,17 +6679,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Αλλαγή σχέσης" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Δημιουργία περιοχών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Οριστικοποίηση σχολίου" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6724,28 +6695,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Διαγραφή επιλεγμένων αντικειμένων." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6754,7 +6720,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7066,7 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7089,7 +7054,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Μη αποθηκευμένες αλλαγές" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7098,7 +7062,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7115,12 +7078,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Αποστολή των τρεχουσών προτιμήσεων στον διακομιστή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7328,9 +7289,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} τροχιά, " -msgstr[1] "{0} τροχιές, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7342,12 +7303,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Διάρκεια: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Μήκος: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8665,7 +8624,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8894,5 +8853,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Αποτυχία εισαγωγής NMEA!" @@ -9083,7 +9042,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9394,22 +9352,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Κλείσιμο πακέτου αλλαγών" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Ανάγνωση {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Λήψη πρόσθετου {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9450,7 +9406,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10829,7 +10785,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Διατήρηση των συντεταγμένων τους" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11025,5 +10981,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11753,14 +11709,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον " -"τέσσερις κόμβους." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} κόμβος" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11770,7 +11723,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} κόμβος" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11779,7 +11732,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Κατάσταση: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11788,12 +11741,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Έκδοση {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11811,5 +11764,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13536,5 +13489,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13812,5 +13765,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13986,7 +13939,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "Οδός ταχείας κυκλοφορίας" +msgstr "" #. group "Highways" @@ -16621,7 +16573,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Μέσα Μαζικής Μεταφοράς" +msgstr "" #. group "Transport" @@ -17440,7 +17391,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "χαλίκι" +msgstr "" #. group "Travel" @@ -18063,13 +18013,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Όρια" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Επεξεργασία Στάσης Λεωφορείου" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -26115,5 +26063,5 @@ #~ msgstr "Επεξεργασία Γραφείου Πληροφοριών" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" #~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα αγγλικάenglish or English or your language." #~ msgstr "" Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 17707) +++ applications/editors/josm/i18n/po/en_GB.po (revision 17708) @@ -10,7 +10,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 02:06+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-20 01:36+0000\n" +"Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -119,5 +119,7 @@ "There are unsaved changes in {0} layers. Discard the changes and continue?" msgstr[0] "" +"There are unsaved changes in {0} layer. Discard the changes and continue?" msgstr[1] "" +"There are unsaved changes in {0} layers. Discard the changes and continue?" #: ../core/src/org/openstreetmap/josm/Main.java:453 @@ -149,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -191,5 +193,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -260,5 +262,5 @@ #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" +msgstr "Could not read file ''{0}''.
Error is:
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -363,4 +365,6 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" +"WARNING: unexpected format of API base URL. Redirection to info or history " +"page for OSM primitive will probably fail. API base URL is: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 @@ -370,4 +374,6 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" +"WARNING: unexpected format of API base URL. Redirection to user page for OSM " +"user will probably fail. API base URL is: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -518,5 +524,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -649,13 +655,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Closing changeset..." +msgstr "Close open changesets" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Closing changeset..." +msgstr "Closes open changesets" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -674,19 +678,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Server does not support changesets" +msgstr "There are no open changesets" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "changesets" +msgstr "No open changesets" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Closing changeset..." +msgstr "Downloading open changesets ..." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -763,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Create Circle" @@ -771,9 +772,9 @@ msgstr "Create a circle from three selected nodes." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Those nodes are not in a circle. Aborting." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -786,5 +787,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -921,5 +922,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 msgid "All Formats" -msgstr "" +msgstr "All Formats" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -939,8 +940,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parameter ''{0}'' must not be null" @@ -1002,5 +1081,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Help page missing. Create it in English." @@ -1008,5 +1087,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1069,65 +1148,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' must not be null" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1224,10 +1242,10 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 msgid "Opening files" -msgstr "" +msgstr "Opening files" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 #, java-format msgid "Opening file ''{0}'' ..." -msgstr "" +msgstr "Opening file ''{0}'' ..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1318,6 +1336,6 @@ msgid "Pasting {0} tag" msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Pasting {0} tag" +msgstr[1] "Pasting {0} tags" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 @@ -1325,6 +1343,6 @@ msgid "to {0} primitive" msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "to {0} primitive" +msgstr[1] "to {0} primtives" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1752,4 +1770,6 @@ "resolve them first." msgstr "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 @@ -1821,9 +1841,11 @@ "again with a new or an existing open changeset." msgstr "" +"Uploading failed because you've been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "changesets" +msgstr "Changeset closed" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -1853,5 +1875,5 @@ #, java-format msgid "Uploading data for layer ''{0}''" -msgstr "" +msgstr "Uploading data for layer ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2180,8 +2202,11 @@ "Really move them?" msgstr "" +"You moved 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:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Always move and don't show dialogue again" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2232,7 +2257,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Please enter a search string." +msgstr "Please enter a filter string." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2253,7 +2277,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "add to selection" +msgstr "find in selection" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2313,5 +2336,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" +msgstr "id:... - object with given ID (0 for new objects)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 @@ -2374,5 +2397,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "Submit filter" -msgstr "" +msgstr "Submit filter" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 @@ -2396,7 +2419,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nothing added to selection by searching for ''{0}''" +msgstr "Nothing find in selection by searching for ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2428,40 +2451,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 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:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, 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:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, 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:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Unexpected token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Missing arguments for or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Missing argument for not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Expected closing bracket." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2472,5 +2495,5 @@ "nodes or range, for example nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2509,60 +2532,60 @@ #, java-format msgid "Add node {0}" -msgstr "" +msgstr "Add node {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "Add way {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 #, java-format msgid "Add relation {0}" -msgstr "" +msgstr "Add relation {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 #, java-format msgid "Change node {0}" -msgstr "" +msgstr "Change node {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 #, java-format msgid "Change way {0}" -msgstr "" +msgstr "Change way {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 #, java-format msgid "Change relation {0}" -msgstr "" +msgstr "Change relation {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 #, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "" +msgstr "Remove \"{0}\" for node ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 #, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "" +msgstr "Remove \"{0}\" for way ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "" +msgstr "Remove \"{0}\" for relation ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 #, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "" +msgstr "Set {0}={1} for node ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 #, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "" +msgstr "Set {0}={1} for way ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 #, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "" +msgstr "Set {0}={1} for relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2605,7 +2628,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2621,5 +2644,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2640,6 +2664,6 @@ msgid "Delete {0} object" msgid_plural "Delete {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Delete {0} object" +msgstr[1] "Delete {0} objects" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 @@ -2647,6 +2671,6 @@ msgid "Delete {0} node" msgid_plural "Delete {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Delete {0} node" +msgstr[1] "Delete {0} nodes" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 @@ -2654,6 +2678,6 @@ msgid "Delete {0} way" msgid_plural "Delete {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Delete {0} way" +msgstr[1] "Delete {0} ways" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 @@ -2661,17 +2685,17 @@ msgid "Delete {0} relation" msgid_plural "Delete {0} relations" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +msgstr[0] "Delete {0} relation" +msgstr[1] "Delete {0} relations" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Conflicting relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Delete from relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2679,6 +2703,8 @@ "from relation?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2686,6 +2712,8 @@ "" msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Split way segment" @@ -2693,5 +2721,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2704,5 +2732,5 @@ "be using them.
Do you really want to delete?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -2751,15 +2779,15 @@ #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Remove node ''{0}'' at position {1} from 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 "Remove way ''{0}'' at position {1} from 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 "Remove relation ''{0}'' at position {1} from relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2777,15 +2805,15 @@ #, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "" +msgstr "Resolve {0} tag conflicts in node {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 #, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "" +msgstr "Resolve {0} tag conflicts in way {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "" +msgstr "Resolve {0} tag conflicts in relation {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2797,19 +2825,19 @@ #, java-format msgid "Resolve version conflicts for node {0}" -msgstr "" +msgstr "Resolve version conflicts for node {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 #, java-format msgid "Resolve version conflicts for way {0}" -msgstr "" +msgstr "Resolve version conflicts for way {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 #, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "" +msgstr "Resolve version conflicts for relation {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Resolve conflicts in node list of way {0}" @@ -2888,5 +2916,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "Warning: failed to persist preferences to ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 @@ -2901,4 +2929,6 @@ "isn't a directory." msgstr "" +"Warning: Failed to initialise preferences. Preference directory ''{0}'' " +"isn't a directory." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -2908,4 +2938,6 @@ "isn't a directory." msgstr "" +"Failed to initialise preferences.
Preference directory ''{0}'' " +"isn't a directory." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 @@ -2915,4 +2947,6 @@ "preference directory: {0}" msgstr "" +"Warning: Failed to initialise preferences. Failed to create missing " +"preference directory: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 @@ -2922,4 +2956,6 @@ "preference directory: {0}" msgstr "" +"Failed to initialise preferences.
Failed to create missing " +"preference directory: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 @@ -2928,4 +2964,5 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"Warning: Missing preference file ''{0}''. Creating a default preference file." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 @@ -2935,4 +2972,6 @@ "file." msgstr "" +"Warning: Replacing existing preference file ''{0}'' with default preference " +"file." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 @@ -2942,4 +2981,6 @@ "to default: {0}" msgstr "" +"Failed to initialise preferences.
Failed to reset preference file " +"to default: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 @@ -2949,4 +2990,6 @@ "
and creating a new default preference file." msgstr "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -2956,4 +2999,6 @@ "default: {0}" msgstr "" +"Warning: Failed to initialise preferences.Failed to reset preference file to " +"default: {0}" #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 @@ -3023,5 +3068,5 @@ msgstr "Changeset {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3030,41 +3075,37 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 msgid "H" -msgstr "" +msgstr "H" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "text" +msgstr "Text" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "C" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "I" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 msgid "M" -msgstr "" +msgstr "M" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "R" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 msgid "A" -msgstr "" +msgstr "A" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200 msgid "D" -msgstr "" +msgstr "D" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201 msgid "F" -msgstr "" +msgstr "F" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 @@ -3081,19 +3122,19 @@ #, java-format msgid "expected id >= 0. Got {0}" -msgstr "" +msgstr "expected id >= 0. Got {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 msgid "a primitive with id=0 can't be invisible" -msgstr "" +msgstr "a primitive with id=0 can't be invisible" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 #, java-format msgid "id > 0 expected. Got {0}" -msgstr "" +msgstr "id > 0 expected. Got {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 #, java-format msgid "version > 0 expected. Got {0}" -msgstr "" +msgstr "version > 0 expected. Got {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25 @@ -3115,9 +3156,11 @@ "multiple values" msgstr "" +"tag collection can't be applied to a primitive because there are keys with " +"multiple values" #: ../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 "" +msgstr "can't add node {0} to incomplete way {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 @@ -3144,5 +3187,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Didn't find an primitive with id {0} in this dataset" @@ -3417,4 +3460,5 @@ msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" +"Could not read bookmarks from
''{0}''
Error was: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3489,13 +3533,13 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 msgid "IO Exception" -msgstr "" +msgstr "IO Exception" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 msgid "Internal Server Error" -msgstr "" +msgstr "Internal Server Error" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 msgid "Bad Request" -msgstr "" +msgstr "Bad Request" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 @@ -3640,13 +3684,13 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "options provided as Java system properties" #: ../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 msgid "Change the folder for all user settings" -msgstr "" +msgstr "Change the folder for all user settings" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3656,4 +3700,7 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " +"the following\n" +" Java option to increase the maximum size of allocated memory" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3808,4 +3855,6 @@ "this list with the mouse.
" msgstr "" +"Middle click again to cycle through.
Hold CTRL to select directly from " +"this list with the mouse.
" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 @@ -3814,7 +3863,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "User" +msgstr "User:" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4185,28 +4233,4 @@ msgstr[1] "Their version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parameter '{0}' must not be null" - #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 @@ -4396,4 +4420,7 @@ "yo agree?" msgstr "" +"To keep your local version, JOSM
has to reset the id of primitive " +"{0} 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 @@ -4550,24 +4577,24 @@ #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" -msgstr "" +msgstr "Conflicts when combining ways - combined way is ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" -msgstr "" +msgstr "Conflicts when merging nodes - merged node is ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 msgid "No conflicts to resolve" -msgstr "" +msgstr "No conflicts to resolve" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 msgid "Cancel conflict resolution" -msgstr "" +msgstr "Cancel conflict resolution" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Apply resolved conflicts" -msgstr "" +msgstr "Apply resolved conflicts" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 @@ -4590,38 +4617,38 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 msgid "Choose a value" -msgstr "" +msgstr "Choose a value" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 msgid "Please decided which values to keep" -msgstr "" +msgstr "Please decided which values to keep" #: ../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 "" +msgstr "Value ''{0}'' is going to be applied for key ''{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 "" +msgid "The key ''{0}'' and all its values are going to be removed" +msgstr "The key ''{0}'' and all its values are going to be removed" #: ../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 "All values joined as ''{0}'' are going to be applied for key ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 #, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "" +msgstr "parameter ''{0}'' must not be empty" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 #, java-format msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" -msgstr "" +msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 msgid "tag collection doesn't include the selected value ''{0}''" -msgstr "" +msgstr "tag collection doesn't include the selected value ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 @@ -4632,21 +4659,21 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63 msgid "Not decided yet" -msgstr "" +msgstr "Not decided yet" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "" +msgstr "Tags from nodes" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 msgid "Tags from ways" -msgstr "" +msgstr "Tags from ways" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 msgid "Tags from relations" -msgstr "" +msgstr "Tags from relations" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "" +msgstr "Conflicts in pasted tags" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 @@ -4673,15 +4700,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "Paste ..." -msgstr "" +msgstr "Paste ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "From ..." -msgstr "" +msgstr "From ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "To ..." -msgstr "" +msgstr "To ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 @@ -4689,16 +4716,16 @@ msgid "{0} tag" msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" +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 "" +msgstr "pos {0} is out of range. current number of members: {1}" #: ../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 "" +msgstr "Remove this relation member from the relation" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37 @@ -4880,27 +4907,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Add Selected" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Edit Pier" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Delete mine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Move up" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Move down" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4909,7 +4931,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Single elements" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4922,7 +4943,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5197,9 +5217,9 @@ msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Undock the panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5207,5 +5227,5 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Click to minimise/maximise the panel content" @@ -5340,5 +5360,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6831,17 +6851,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Create areas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Changeset {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6850,28 +6867,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Please select which property changes you want to apply." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Closing changeset..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Delete selected objects." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Closing changeset..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6880,7 +6892,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Closing changeset..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7192,7 +7204,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "upload all changes in one request" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7209,7 +7220,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7218,7 +7228,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Unsaved Changes" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7227,7 +7236,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "No changes to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7244,17 +7252,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Upload the current preferences to the server" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Delete the currently selected tags" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "parameter ''{0}'' > 0 expected, got ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7457,9 +7463,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} track, " -msgstr[1] "{0} tracks, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7471,12 +7477,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Timespan: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Length: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8840,7 +8844,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Use preset ''{0}'' of group ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8865,7 +8869,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter ''{0}'' > 0 expected, got ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9071,5 +9075,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA import failure!" @@ -9121,7 +9125,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9210,7 +9214,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "mandatory attribute ''{0}'' missing" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9219,17 +9223,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" -msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" -msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" -msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9263,7 +9267,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Closing changeset..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9586,22 +9589,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Closing changeset..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Closing changeset..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Reading {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Downloading Plugin {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9641,7 +9642,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Use preset ''{0}'' of group ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9649,7 +9650,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" -msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11058,7 +11059,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Keep their coordiates" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11260,5 +11261,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "TangoGPS import failure!" @@ -11988,22 +11989,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Please select one or more closed ways of at least four nodes." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} node" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Change {0} {1}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} node" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12012,7 +12012,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Mode: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12021,12 +12021,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Version {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Version {0} created on {1} by {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12044,5 +12044,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13821,5 +13821,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14120,5 +14120,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14317,7 +14317,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "highway" +msgstr "" #. group "Highways" @@ -16952,7 +16951,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Public Transport" +msgstr "" #. group "Transport" @@ -17771,7 +17769,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "gravel" +msgstr "" #. group "Travel" @@ -18394,13 +18391,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Boundaries" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Edit Bus Stop" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19558,7 +19553,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Man Made" +msgstr "" #. group "Man-Made" @@ -21053,7 +21047,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geographic" +msgstr "" #. group "Places" @@ -26132,21 +26125,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- running version is {0}" - -#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" -#~ msgstr "INFO: entering compatibilty mode for JOSM with Main.ds" - -#~ msgid "" -#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" -#~ msgstr "" -#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter '{0}' must not be null" #~ msgid "Move" @@ -26636,4 +26614,7 @@ #~ msgstr "Map Type" +#~ msgid "- running version is {0}" +#~ msgstr "- running version is {0}" + #~ msgid "Directly load TCX files from JOSM." #~ msgstr "Directly load TCX files from JOSM." @@ -26651,9 +26632,9 @@ #~ msgstr "Remove route nodes" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "Help page missing. Create it in English." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26887,2 +26868,17 @@ #~ "Failed to close changeset {0}, will be closed by server after timeout. " #~ "Exception was: {1}" + +#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +#~ msgstr "INFO: entering compatibilty mode for JOSM with Main.ds" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." + +#~ msgid "" +#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +#~ msgstr "" +#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 17707) +++ applications/editors/josm/i18n/po/es.po (revision 17708) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 15:12+0000\n" -"Last-Translator: Juan Luis \n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:09+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -151,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -193,5 +193,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -520,5 +520,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -651,13 +651,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -676,19 +674,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Cerrando conjunto de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -764,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Crear círculo" @@ -772,9 +767,9 @@ msgstr "Crear un círculo a partir de tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Los nodos no se encuentrar en un círculo. Abortando." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -787,5 +782,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -943,9 +938,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "el parametro \"{0}\" no debe ser nulo" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "el parámetro ''{0}'' no debe ser nulo" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1006,14 +1079,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." -msgstr "Falta la página de ayuda. Créela en english." +msgid "Help page missing. Create it in English." +msgstr "Falta la página de ayuda. Créela en English." #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" -"Falta la página de ayuda. Créela en english o English o su idioma." @@ -1075,65 +1148,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "el parámetro ''{0}'' no debe ser nulo" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1839,7 +1851,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "conjuntos de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2258,7 +2269,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Por favor, introduzca una cadena de búsqueda." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2279,7 +2289,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "añadir a la selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2429,7 +2438,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2462,5 +2471,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2468,10 +2477,10 @@ "de uso: clave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2480,26 +2489,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autentificación inexperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "No se encuentran los argumentos de or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "No se encuentran los argumentos de not" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Se esperaba un cierre de paréntesis." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2510,5 +2519,5 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2641,7 +2650,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2657,5 +2666,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " @@ -2701,14 +2711,14 @@ msgstr[1] "Eliminar {0} relaciones" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relación con conclicto" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Borrar de la relación" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2717,5 +2727,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2724,5 +2734,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Dividir segmento de vía" @@ -2730,5 +2740,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2741,5 +2751,5 @@ "usándolos.
¿Esta seguro que quiere borrarlo?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Confirmación antes de borrar" @@ -2847,6 +2857,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Resolver conflictos en la lista de nodos de la vía {0}" @@ -3065,5 +3075,5 @@ msgstr "Conjunto de cambios {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3075,17 +3085,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "texto" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3094,7 +3101,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3186,5 +3192,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" @@ -3860,7 +3866,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Usuario" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4243,28 +4248,4 @@ msgstr[0] "Su versión ({0} entrada)" msgstr[1] "Su versión ({0} entradas)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "el parámetro '{0}' no debe ser nulo" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4670,5 +4651,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4944,27 +4925,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Añadir seleccionado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Editar embarcadero" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Borrar lo mío" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Mover hacia arriba" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Mover hacia abajo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4973,7 +4949,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Solo los elementos" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4986,7 +4961,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filtrar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5263,9 +5237,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Desacoplar el panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5274,5 +5248,5 @@ "herramientas de la izquierda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Haga click para minimizar/maximizar el contenido del panel" @@ -5405,5 +5379,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6871,17 +6845,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Conjunto de cambios {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Crear áreas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Conjunto de cambios {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6890,28 +6861,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Cerrando conjunto de cambios" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Cerrar el conjunto de cambios actual..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Cerrando conjunto de cambios" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6920,7 +6886,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Cerrando conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7234,7 +7200,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "subir todos los cambios en una petición" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7251,27 +7216,22 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Etiquetas del nuevo conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "No abrir un conjunto de cambios" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Ningún cambio que subir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7288,17 +7248,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Subir las preferencias actuales al servidor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Cerrar el conjunto de cambios actual..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7502,9 +7460,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} traza, " -msgstr[1] "{0} trazas, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7516,12 +7474,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Rango de tiempo " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Longitud: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8906,7 +8862,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Usar preferencia ''{0}'' del grupo ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8931,7 +8887,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"" +msgstr "" #. SAXException does not chain correctly @@ -9137,5 +9093,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "¡Fallo en la importación NMEA!" @@ -9186,7 +9142,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "parámetro {0} > 0 necesario. Obtenido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9275,7 +9231,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "atributo \"{0}\" obligatorio perdido" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9284,23 +9240,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal 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/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric 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/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean 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/OsmChangesetParser.java:159 @@ -9334,7 +9284,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Cerrando conjunto de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9657,22 +9606,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Actualizando conjunto de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Cerrando conjunto de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Actualizando conjunto de cambios {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Actualizando conjunto de cambios {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9713,7 +9660,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Usar preferencia ''{0}'' del grupo ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9721,9 +9668,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" msgstr "" -"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido " -"\"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11140,7 +11085,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Fijar coordenada Lambert" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11344,5 +11289,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "¡Importación de TangoGPS fallida!" @@ -12079,23 +12024,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Por favor, seleccione una o más vías cerradas de al menos cuatro nodos." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Cambiar {0} {1}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12104,7 +12047,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Añadir vía {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12113,12 +12056,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versión {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Versión {0} creada en {1} por {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12136,5 +12079,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13921,10 +13864,10 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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?" msgstr "" -"La URL base
''{0}''
para esta capa WML no finaliza con un ''&'' " +"La URL base
''{0}''
para esta capa WMS 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 " @@ -14231,5 +14174,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14441,7 +14384,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "vía" +msgstr "" #. group "Highways" @@ -17077,7 +17019,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Transporte público" +msgstr "" #. group "Transport" @@ -17896,7 +17837,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "grava" +msgstr "" #. group "Travel" @@ -18519,13 +18459,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Fronteras" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Editar librería" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19683,7 +19621,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Construcciones" +msgstr "" #. group "Man-Made" @@ -21178,7 +21115,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geográfica" +msgstr "" #. group "Places" @@ -26264,19 +26200,6 @@ msgstr "" -#~ msgid "Close current changeset" -#~ msgstr "Cerrar el actual conjunto de cambios" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Actualmente no hay un conjunto cambios abierto." - -#~ msgid "- running version is {0}" -#~ msgstr "- la versión en ejecución es la {0}" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo" - -#~ 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" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "el parámetro '{0}' no debe ser nulo" #~ msgid "Move" @@ -26789,12 +26712,12 @@ #~ "interesantes." -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Página de ayuda perdida. Crearla en english." +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "Página de ayuda perdida. Crearla en English." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Página de ayuda perdida. Crearla en english or English or spanish." @@ -26954,4 +26877,7 @@ #~ msgstr "Eliminando miembro de relación {0} {1}" +#~ msgid "- running version is {0}" +#~ msgstr "- la versión en ejecución es la {0}" + #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "" @@ -26978,2 +26904,15 @@ #~ msgid "Delete all" #~ msgstr "Borrar todo" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo" + +#~ msgid "There is currently no changeset open." +#~ msgstr "Actualmente no hay un conjunto cambios abierto." + +#~ msgid "Close current changeset" +#~ msgstr "Cerrar el actual conjunto de cambios" + +#~ 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" Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 17707) +++ applications/editors/josm/i18n/po/et.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 02:58+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 19:57+0000\n" "Last-Translator: lyyser \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -512,5 +512,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -637,13 +637,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -667,13 +665,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -747,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Moodusta ring" @@ -755,9 +751,9 @@ msgstr "Moodusta valitud kolmest sõlmest ring." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Sõlmed ei moodusta ringi. Katkestan." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -768,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -903,5 +899,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 msgid "All Formats" -msgstr "" +msgstr "Kõik formaadid" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -921,8 +917,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parameeter ''{0}'' ei tohi olla null" @@ -935,5 +1009,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "Ekspordi GPX fail" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 @@ -984,5 +1058,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -990,5 +1064,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1031,5 +1105,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 msgid "Merge layer" -msgstr "" +msgstr "Liida kihid" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 @@ -1049,65 +1123,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameeter ''{0}'' ei tohi olla null" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1204,5 +1217,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 msgid "Opening files" -msgstr "" +msgstr "Faili avamine" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 @@ -1785,7 +1798,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Muuta väärtusi?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2180,7 +2192,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Palun sisesta otsingu tekst" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2201,7 +2212,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "lisa valikusse" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2368,40 +2378,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 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:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2410,5 +2420,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2543,5 +2553,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2555,5 +2565,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2597,14 +2608,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Konfliktne relatsioon" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2613,5 +2624,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2620,5 +2631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2626,5 +2637,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2634,5 +2645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2739,5 +2750,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2947,5 +2958,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2957,12 +2968,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "Test" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "WC" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3066,5 +3075,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3726,7 +3735,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Kasutajanimi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4078,28 +4086,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4484,5 +4468,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4756,27 +4740,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Lisa valitud" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Vali lihunik" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Vali miski:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Liigu üles" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Liigu alla" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4785,7 +4764,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "siseosa" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4798,7 +4776,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Kustutusrežiim" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5073,9 +5050,9 @@ msgstr "Valik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Lase paneel vabaks" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5083,5 +5060,5 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" @@ -5214,5 +5191,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6676,17 +6653,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Muuda seost" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Alade loomine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Muuda seost" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6695,28 +6669,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Palun vali objektid mille seadeid soovid muuta." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Sulgen muutustekogumit..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Kustuta valitud objektid." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Sulgen muutustekogumit..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6725,7 +6694,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7037,7 +7006,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "lae kõik muudatused ühe päringuga" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7062,7 +7030,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Salvestamata muudatused" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7071,7 +7038,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Pole muudatusi mida üles laadida." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7088,12 +7054,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Lae käesolikud valikud serverisse" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Liiguta hetkel valitud liiget ülespoole" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7301,9 +7265,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} tee" -msgstr[1] "{0} teed" +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -8619,7 +8583,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8644,7 +8608,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #. SAXException does not chain correctly @@ -8846,5 +8810,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA impordi viga!" @@ -9035,7 +8999,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9344,22 +9307,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Sulgen muutustekogumit..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9398,7 +9359,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10749,7 +10710,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Null koordinaadid: " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10942,5 +10903,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11660,12 +11621,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} punkt" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11675,7 +11635,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} punkt" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11684,7 +11644,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Režiim: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11693,7 +11653,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versioon {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11716,5 +11676,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13433,5 +13393,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13704,5 +13664,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -16512,7 +16472,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Avalik transport" +msgstr "" #. group "Transport" @@ -17331,7 +17290,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Salvesta" +msgstr "" #. group "Travel" @@ -17954,13 +17912,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Piirid" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Vali riistvara pood" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19118,7 +19074,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Inimtekkeline" +msgstr "" #. group "Man-Made" @@ -25806,12 +25761,12 @@ #~ msgstr "Kõik teed olid tühjad." -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Abileht puudub. Loo see english." +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "Abileht puudub. Loo see English." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Abileht puudub. Loo see english või English või eesti" Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 17707) +++ applications/editors/josm/i18n/po/fi.po (revision 17708) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" "PO-Revision-Date: 2009-09-15 05:24+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -512,5 +512,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -639,13 +639,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -664,19 +662,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Palvelin ei tue muutoskokoelmia" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -751,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Luo ympyrä" @@ -759,9 +754,9 @@ msgstr "Luo ympyrän kolmesta valitusta pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Valituista pisteistä ei voi muodostaa ympyrää." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -773,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -926,8 +921,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parametri ''{0}'' ei saa olla tyhjä" @@ -989,5 +1062,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -995,5 +1068,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1054,65 +1127,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1792,7 +1804,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Muutetaanko arvot?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2192,7 +2203,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Anna hakusana." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2213,7 +2223,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "lisää valintaan" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2351,7 +2360,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2383,40 +2392,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Päättävä sulkumerkki puuttuu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2425,5 +2434,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2558,5 +2567,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2570,5 +2579,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2612,14 +2622,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Ristiriidassa oleva relaatio" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Poista relaatiosta" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2628,5 +2638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2635,5 +2645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Katkaise polku" @@ -2641,5 +2651,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2652,5 +2662,5 @@ "
Oletko varma, että haluat poistaa ne?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2757,5 +2767,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2967,5 +2977,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2977,12 +2987,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "teksti" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "WC" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3086,5 +3094,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3741,7 +3749,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Käytä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4093,28 +4100,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4499,5 +4482,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4771,27 +4754,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Lisää valitut" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Muokkaa laiturin ominaisuuksia" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Poista taso" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Siirrä ylös" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Siirrä alas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4800,7 +4778,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Yksittäiset elementit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4813,7 +4790,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Poistotila" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5088,9 +5064,9 @@ msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Irroita paneeli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5099,5 +5075,5 @@ "työkalupalkin napista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" @@ -5230,5 +5206,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6694,17 +6670,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Muuta relaatiota" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Luo alueita" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Lähetä kommentti" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6713,28 +6686,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Poista valitut objektit." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Suljetaan muutoskokoelma..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6743,7 +6711,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7055,7 +7023,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7078,7 +7045,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Tallentamattomia muutoksia" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7087,7 +7053,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Ei lähetettäviä muutoksia." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7104,12 +7069,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Lähetä nykyiset asetukset palvelimelle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Siirrä valittuja jäseniä ylöspäin" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7317,9 +7280,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} jälki, " -msgstr[1] "{0} jälkeä, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7331,12 +7294,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Ajanjakso: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Pituus: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8657,7 +8618,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8682,7 +8643,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parametri ''{0}'' ei saa olla tyhjä" +msgstr "" #. SAXException does not chain correctly @@ -8886,5 +8847,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA-tuonti epäonnistui" @@ -9075,7 +9036,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9384,22 +9344,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Luetaan {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9438,7 +9396,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -11002,5 +10960,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11730,23 +11688,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} piste" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Muuta pistettä {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} piste" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11755,7 +11711,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Lisää polku {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11764,7 +11720,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versio {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11787,5 +11743,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13539,5 +13495,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13814,5 +13770,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13988,7 +13944,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "tie" +msgstr "" #. group "Highways" @@ -16623,7 +16578,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Julkinen liikenne" +msgstr "" #. group "Transport" @@ -17442,7 +17396,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "sora" +msgstr "" #. group "Travel" @@ -18065,13 +18018,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Rajat" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Muokkaa linja-autopysäkin ominaisuuksia" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 17707) +++ applications/editors/josm/i18n/po/fr.po (revision 17708) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-18 16:55+0000\n" -"Last-Translator: François Blondel \n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:29+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -191,5 +191,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -522,5 +522,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -655,13 +655,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -680,19 +678,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Fermeture de la révision..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -770,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Créer un cercle" @@ -778,9 +773,9 @@ msgstr "Créer un cercle à partir de trois nœuds sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Ces nœuds ne sont pas en cercle. Abandon." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -793,5 +788,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -948,9 +943,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "le paramètre \"{0}\" ne doit pas être nul" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "le paramètre \"{0}\" ne doit pas être vide" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1012,5 +1085,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Page d’aide manquante. Créez-la en français." @@ -1018,5 +1091,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1079,65 +1152,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "le paramètre \"{0}\" ne doit pas être vide" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1847,7 +1859,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "jeux de données" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2271,7 +2282,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Entrer le texte à rechercher." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2292,7 +2302,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "ajouter à la sélection" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2440,7 +2449,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2473,5 +2482,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2479,10 +2488,10 @@ "d'utilisation : clé=valeur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2491,26 +2500,26 @@ "relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Jeton inattendu : {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Arguments manquants pour le OU" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Arguments manquants pour le -" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Les parenthèses doivent être fermées." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2522,5 +2531,5 @@ "10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2653,7 +2662,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2669,5 +2678,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " @@ -2713,14 +2723,14 @@ msgstr[1] "Supprimer {0} relations" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relation conflictuelle" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Supprimer de la relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2731,5 +2741,5 @@ "{2}.
Enlever de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2740,5 +2750,5 @@ "de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Séparer le segment du chemin" @@ -2746,5 +2756,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2757,5 +2767,5 @@ "voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -2863,6 +2873,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}" @@ -3081,5 +3091,5 @@ msgstr "Ensemble de changements {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3091,17 +3101,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "texte" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3110,7 +3117,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3203,5 +3209,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" @@ -3883,7 +3889,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Utilisateur" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4261,28 +4266,4 @@ msgstr[0] "Leur version ({0} élément)" msgstr[1] "Leur version ({0} éléments)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "le paramètre {0} ne peut pas être vide" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4685,5 +4666,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "La clé \"{0}\" et toutes ses valeurs vont être supprimées." @@ -4960,27 +4941,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Ajouter la sélection" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Modifier jetée/ponton" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Supprimer ma version" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Déplacer vers le haut" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Déplacer vers le bas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4989,7 +4965,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Eléments seuls" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -5002,7 +4977,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filtrez" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5280,9 +5254,9 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5291,5 +5265,5 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" @@ -5426,5 +5400,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6912,17 +6886,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Ensemble de changements {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Créer des surfaces" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Ensemble de changements {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6931,28 +6902,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Merci de sélectionner les changements que vous voulez appliquer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Fermeture de l'ensemble de changements" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Fermer l'ensemble de changements actuel..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Fermeture de l'ensemble de changements" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6961,7 +6927,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Fermeture de l'ensemble de changements" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7284,7 +7250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Charger tous les changements dans une requête" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7301,34 +7266,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Tags du nouvel ensemble de changements" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Aucun ensemble de changements ouvert" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Aucun changement à envoyer." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next 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:895 @@ -7341,17 +7298,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Charger les préférences actuelles vers le serveur" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Supprimer les étiquettes sélectionnées" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7554,9 +7509,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} trace, " -msgstr[1] "{0} traces, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7568,12 +7523,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Intervalle de temps : " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Longueur : " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8970,7 +8923,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8995,7 +8948,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" +msgstr "" #. SAXException does not chain correctly @@ -9208,5 +9161,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Erreur lors de l'import des trames NMEA !" @@ -9260,7 +9213,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "paramètre {0} > 0 requis. Reçu {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9349,7 +9302,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "attribut obligatoire \"{0}\" manquant" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9358,23 +9311,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal 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/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric 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/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean 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/OsmChangesetParser.java:159 @@ -9408,7 +9355,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Fermeture de la révision..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9736,22 +9682,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Fermeture de la révision..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Fermeture de la révision..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Lecture de {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Téléchargement du greffon {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9792,7 +9736,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9800,9 +9744,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" msgstr "" -"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " -"\"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11241,7 +11183,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Conserver leurs coordonnées" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11448,5 +11390,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Erreur d'import de TangoGPS !" @@ -12191,24 +12133,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre " -"nœuds." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nœud" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Changer {0} {1}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nœud" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12217,7 +12156,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Ajouter le chemin {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12226,12 +12165,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Version {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Version {0} créée le {1} par {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12249,9 +12188,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"Le greffon openstreetbus utilise l’ancien serveur sur appspot.com." +"Le greffon openstreetbugs utilise l’ancien serveur sur appspot.com." "
Un nouveau serveur est disponible sur schokokeks.org.
Voulez-vous " "passer au nouveau serveur ? (fortement recommandé)" @@ -14069,5 +14008,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14374,5 +14313,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14579,7 +14518,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "highway" +msgstr "" #. group "Highways" @@ -17214,7 +17152,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Transport public" +msgstr "" #. group "Transport" @@ -18033,7 +17970,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "gravier" +msgstr "" #. group "Travel" @@ -18656,13 +18592,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Frontières" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Éditer librairie" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19820,7 +19754,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Édifices" +msgstr "" #. group "Man-Made" @@ -21315,7 +21248,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geographic" +msgstr "" #. group "Places" @@ -26394,58 +26326,6 @@ msgstr "" -#~ msgid "Close current changeset" -#~ msgstr "Fermer ensemble de changements actuel" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert." - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul." - -#~ msgid "- running version is {0}" -#~ msgstr "- version utilisée {0}" - -#~ msgid "not yet decided" -#~ msgstr "Pas encore décidé." - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer" - -#~ 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" - -#~ 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." - -#~ 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." - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "" -#~ "Utiliser la session de modification existante {0} et la conserver ouverte." - -#~ 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." - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont " -#~ "été trouvés." +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "le paramètre {0} ne peut pas être vide" #~ msgid "Move" @@ -26955,6 +26835,9 @@ #~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste." -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Page d’aide manquante. Créez la sur english." +#~ msgid "- running version is {0}" +#~ msgstr "- version utilisée {0}" + +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "Page d’aide manquante. Créez la sur English." #~ msgid "Directly load TCX files from JOSM." @@ -27100,8 +26983,8 @@ #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Page d’aide manquante. Créez la sur english ou English ou French." @@ -27145,6 +27028,58 @@ #~ msgstr "Tout supprimer" +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont " +#~ "été trouvés." + #~ 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}" + +#~ msgid "There is currently no changeset open." +#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert." + +#~ msgid "Close current changeset" +#~ msgstr "Fermer ensemble de changements actuel" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer" + +#~ 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" + +#~ 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." + +#~ 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." + +#~ 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." + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "" +#~ "Utiliser la session de modification existante {0} et la conserver ouverte." + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul." + +#~ msgid "not yet decided" +#~ msgstr "Pas encore décidé." Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 17707) +++ applications/editors/josm/i18n/po/gl.po (revision 17708) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" "PO-Revision-Date: 2009-06-27 15:34+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -512,5 +512,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -637,13 +637,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -667,13 +665,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -748,5 +744,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Crear Círculo" @@ -756,9 +752,9 @@ msgstr "Crear un círculo a partir de tres nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -769,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -923,9 +919,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "o parámetro \"{0}\" debe non ser nulo" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -986,5 +1060,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Páxina de axuda perdida. Créea en inglés." @@ -992,5 +1066,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1053,65 +1127,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "o parámetro \"{0}\" debe non ser nulo" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1811,7 +1824,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Cambiar valores?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2218,7 +2230,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Por favor, introduce unha cadea de busca." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2239,7 +2250,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "engadir á selección" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2383,7 +2393,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Non se engadiu nada á selección buscando por \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2416,14 +2426,14 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2432,26 +2442,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Faltan argumentos para OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Faltan argumentos para NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Esperabase parentese de peche." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2462,5 +2472,5 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2595,5 +2605,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2607,5 +2617,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2649,14 +2660,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relación contradictoria" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Borrar da relación" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2665,5 +2676,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2672,5 +2683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Separar segmento de vía" @@ -2678,5 +2689,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2689,5 +2700,5 @@ "estar usandoos.
Queres borralos realmente?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2795,6 +2806,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Resolver conflitos na lista de nodos da vía {0}" @@ -3006,5 +3017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3016,17 +3027,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "texto" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3035,7 +3043,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3127,5 +3134,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" @@ -3792,7 +3799,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Nome de usuario" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4147,28 +4153,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4555,5 +4537,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4828,7 +4810,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Engadir Seleccionados" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 @@ -4837,17 +4818,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Borrar a miña" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Mover cara arriba" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Mover cara abaixo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4868,7 +4846,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Borrar Modo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5145,9 +5122,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5156,5 +5133,5 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" @@ -5288,5 +5265,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6754,17 +6731,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Cambiar relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Crear áreas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Cambiar relación" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6773,28 +6747,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Por favor, selecciona que cambios de propiedade queres aplicar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Pechando colección de cambios..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Borrar obxectos seleccionados." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Pechando colección de cambios..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6803,7 +6772,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7115,7 +7084,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "SIbir todos os cambios ó servidor OSM." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7138,7 +7106,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Cambios non gardados" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7147,7 +7114,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Non hai cambios que subir." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7164,17 +7130,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Subir as preferencias actuais ó servidor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Mover os membros actualmente seleccionados cara arriba" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7377,9 +7341,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} trazado, " -msgstr[1] "{0} trazados, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7391,12 +7355,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Rango de tempo: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Lonxitude: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8764,7 +8726,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8789,7 +8751,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\"" +msgstr "" #. SAXException does not chain correctly @@ -8993,5 +8955,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Fallo de importación NMEA!" @@ -9042,7 +9004,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9184,7 +9146,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9495,22 +9456,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Lendo {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Pechando colección de cambios..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9551,7 +9510,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10917,7 +10876,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Coordenada cero: " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11112,5 +11071,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11830,13 +11789,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11846,7 +11803,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11855,7 +11812,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Modo: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11864,7 +11821,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versión {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11887,5 +11844,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13605,5 +13562,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13876,5 +13833,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14050,7 +14007,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "Carretera" +msgstr "" #. group "Highways" @@ -17503,7 +17459,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Gardar" +msgstr "" #. group "Travel" Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 17707) +++ applications/editors/josm/i18n/po/he.po (revision 17708) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" "PO-Revision-Date: 2009-09-15 05:36+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -516,5 +516,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -643,13 +643,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -668,19 +666,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "אין סט שינויים פתוח כרגע" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "מוריד משטח תמונה..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -751,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "צור עיגול" @@ -759,9 +754,9 @@ msgstr "צור עיגול משלושה צמתים נבחרים" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "הצמתים הללו אינם חלק ממעגל. מבטל." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -773,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -926,8 +921,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" @@ -989,5 +1062,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -995,5 +1068,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1054,65 +1127,4 @@ msgid "Please select at least two nodes to merge." msgstr "אנא בחר לפחות שני צמתים למיזוג." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1776,7 +1788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "לשנות ערכים?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2175,7 +2186,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "נא הזן מחרוזת לחיפוש." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2196,7 +2206,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "הוספה לבחירה" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2336,7 +2345,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2368,40 +2377,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "חסרים ארגומנטים ל-or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "חסרים ארגומנטים ל-not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "ציפיתי לסוגר סוגריים." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2410,5 +2419,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2543,5 +2552,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2555,5 +2564,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2597,14 +2607,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "יחס מתנגש" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "מחק מיחס" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2613,5 +2623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2620,5 +2630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "פצל קטע דרך" @@ -2626,5 +2636,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2636,5 +2646,5 @@ "אחרים {שאתה לא רואה) עשויים להשתמש בהם.
האם אתה באמת רוצה למחוק?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2740,6 +2750,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "פתור התנגשויות רשימת הנקודות בדרך {0}" @@ -2949,5 +2959,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2959,17 +2969,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "טקסט" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -2978,7 +2985,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3070,5 +3076,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3730,7 +3736,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "משתמש" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4090,28 +4095,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4496,5 +4477,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4767,27 +4748,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "הוסף את הנבחרים" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "ערוך מקלט" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "מחק את שלי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "הזז מעלה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "הזז מטה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4796,7 +4772,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "אלמנטים בודדים" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4809,7 +4784,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "מצב מחיקה" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5084,14 +5058,14 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -5224,5 +5198,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6686,17 +6660,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "שנה יחס" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "צור אזורים" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "הערת ביצוע" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6705,28 +6676,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "סגור את סט השינויים הנוכחי ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "סגור את סט השינויים הנוכחי" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6735,7 +6701,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7047,7 +7013,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "העלה את כל השינויים לשרת ה-OSM" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7062,7 +7027,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7071,7 +7035,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "סגור את סט השינויים הנוכחי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7080,7 +7043,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "אין שינויים להעלאה." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7097,12 +7059,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "העלה את המאפיינים הנוכחיים לשרת" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "סגור את סט השינויים הנוכחי ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7310,9 +7270,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "מסלול" -msgstr[1] "מסלולים" +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7328,7 +7288,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "אורך: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8656,7 +8615,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" +msgstr "" #. SAXException does not chain correctly @@ -8858,5 +8817,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "יבוא NMEA נכשל!" @@ -9355,22 +9314,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "קורא {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "מוריד משטח תמונה..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "קורא {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "מוריד נקודות {0} עד {1}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10772,7 +10729,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "שמור את הקואורדינטות שלהם" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10965,5 +10922,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11686,12 +11643,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "נקודה {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11701,7 +11657,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "נקודה {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11710,7 +11666,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "נקודה: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11719,7 +11675,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "גירסא {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11742,5 +11698,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13464,5 +13420,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13737,5 +13693,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13911,7 +13867,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "כביש ראשי" +msgstr "" #. group "Highways" @@ -16546,7 +16501,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "תחבורה ציבורית" +msgstr "" #. group "Transport" @@ -17365,7 +17319,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "חצץ" +msgstr "" #. group "Travel" @@ -17988,13 +17941,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "גבולות" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "ערוך תחנת אוטובוס" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19152,7 +19103,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "מעשה אדם" +msgstr "" #. group "Man-Made" @@ -25725,6 +25675,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- הגירסה שרצה היא {0}" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)" #~ msgid "Move" @@ -26016,4 +25966,7 @@ #~ msgstr "דרכים" +#~ msgid "- running version is {0}" +#~ msgstr "- הגירסה שרצה היא {0}" + #~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 17707) +++ applications/editors/josm/i18n/po/is.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-18 18:36+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:27+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -638,13 +638,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Loka núverandi breytingarsetti" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Loka núverandi breytingarsetti" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -663,19 +661,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Tögg fyrir nýtt breytingarsett" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Loka núverandi breytingarsetti" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Loka breytingasetti..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -752,5 +747,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Búa til hring" @@ -760,9 +755,9 @@ msgstr "Búa til hring úr þrem völdum hnútum." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -773,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -926,8 +921,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "" @@ -989,5 +1062,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -995,5 +1068,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1054,65 +1127,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1776,7 +1788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Breyta eigindum" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2170,7 +2181,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Sláðu inn leitarstreng" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2191,7 +2201,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "bæta við val" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2367,14 +2376,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2383,26 +2392,26 @@ "hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2411,5 +2420,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2544,5 +2553,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2556,5 +2565,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2598,14 +2608,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Vensl rekast á" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Fjarlægja úr venslum" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2614,5 +2624,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2621,5 +2631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2627,5 +2637,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2638,5 +2648,5 @@ "verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2743,5 +2753,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2951,5 +2961,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2961,17 +2971,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "Næsta" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "stafsetursnæmt" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "stafsetursónæmt" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3071,5 +3078,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3725,7 +3732,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Notandanafn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4077,28 +4083,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4483,5 +4465,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4758,22 +4740,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Breyti bryggju" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Fjarlægja" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Færa upp" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Færa niður" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -5068,9 +5046,9 @@ msgstr "Val: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Opna þessa stiku sem glugga" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5079,5 +5057,5 @@ "vinstri tólastikunni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Smelltu til að minnka/hámarka innihald stikunnar" @@ -5210,5 +5188,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6673,17 +6651,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Breyta venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Búa til svæði" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Breyta venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6692,28 +6667,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Veldu hluti til að breyta eigindum þeirra." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Bý til breytingarsett..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Loka breytingasetti..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Loka núverandi breytingarsetti ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Loka breytingasetti..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6722,7 +6692,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Loka breytingasetti..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7034,7 +7004,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "senda allar breytingarnar í einu á þjónin" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7051,34 +7020,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Tögg fyrir nýtt breytingarsett" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Opna nýtt breytingarsett og skilja það eftir opið" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Loka núverandi breytingarsetti" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Hlaða upp sem nýju breytingarsetti eða bæta við eldra?" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Engar breytingar til að hlaða upp." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next 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:895 @@ -7091,12 +7052,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Hlaða JOSM stillingum þínum upp á OSM þjóninn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Eyða völdum töggum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7304,9 +7263,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} ferill, " -msgstr[1] "{0} ferlar, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7318,12 +7277,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Tímaspan: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Lengd: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8625,7 +8582,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8850,5 +8807,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "" @@ -9039,7 +8996,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Loka breytingasetti..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9349,22 +9305,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Bý til breytingarsett..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Loka breytingasetti..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Bý til breytingarsett..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Niðurhel {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9404,7 +9358,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10958,5 +10912,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11676,12 +11630,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} hnútur" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11691,7 +11644,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} hnútur" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11700,7 +11653,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Kort: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11709,12 +11662,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Útgáfa {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Útgáfa {0} búin til {1} af {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11732,5 +11685,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13448,5 +13401,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13719,5 +13672,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -16527,7 +16480,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Almenningssamgöngur" +msgstr "" #. group "Transport" @@ -17346,7 +17298,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Vista" +msgstr "" #. group "Travel" @@ -17969,13 +17920,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Landamæri" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Breyti strætóstoppi" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19133,7 +19082,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Mannvirki" +msgstr "" #. group "Man-Made" @@ -25706,9 +25654,173 @@ msgstr "" +#~ msgid "Aborting..." +#~ msgstr "Hætti við..." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." +#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." + +#~ msgid "Unknown file extension." +#~ msgstr "Óþekkt skráarending" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " +#~ "reyna síðar." + +#~ msgid "Unknown version" +#~ msgstr "Óþekkt útgáfa" + +#~ msgid "Email" +#~ msgstr "Netfang" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Bæta völdum hlutum við venslin" + +#~ msgid "unnamed" +#~ msgstr "ónefnt" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Árekstrar: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} hlutur hefur árekstra:" +#~ msgstr[1] "{0} hlutir hafa árekstra:" + +#~ msgid "sports" +#~ msgstr "íþróttir" + +#~ msgid "Ill-formed node id" +#~ msgstr "Illa-formað kenni á hnút" + +#~ 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ð?" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" + +#~ msgid "Remove Selected" +#~ msgstr "Fjarlægja val" + +#~ msgid "Revert" +#~ msgstr "Afturkalla" + +#~ msgid "Validate" +#~ msgstr "Athuga" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Athuga núverandi val eða öll gögn í laginu." + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." + +#~ msgid "Data Layer" +#~ msgstr "Gagnalag" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Leiðrétta stöðu WMS lagsins" + +#~ msgid "Occupied By" +#~ 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 "- running version is {0}" #~ msgstr "{0}" +#~ msgid "nodes" +#~ msgstr "hnútar" + +#~ msgid "Move Up" +#~ msgstr "Færa upp" + +#~ msgid "Move Down" +#~ msgstr "Færa niður" + +#~ msgid "Sort" +#~ msgstr "Raða" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Raða völdum meðlimum eða öllum listanum" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Stök: {0} (tengd: {1})" + +#~ msgid "linked" +#~ msgstr "tengd" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." + +#~ 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 "Merge nodes with different memberships?" +#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" + #~ msgid "Use a new changeset and close it" #~ msgstr "Opna nýtt breytingarsett og loka því strax" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "Nota opið breytingarsett #{0} og loka því" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið" #~ msgid "" @@ -25719,7 +25831,4 @@ #~ "að bæta við frekari breytingum síðar meir" -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "Nota opið breytingarsett #{0} og loka því" - #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " @@ -25729,7 +25838,4 @@ #~ "breytingunni hefur verið upphlaðið" -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið" - #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " @@ -25738,160 +25844,2 @@ #~ "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" - -#~ msgid "Aborting..." -#~ msgstr "Hætti við..." - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." -#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." - -#~ msgid "Unknown file extension." -#~ msgstr "Óþekkt skráarending" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " -#~ "reyna síðar." - -#~ msgid "Unknown version" -#~ msgstr "Óþekkt útgáfa" - -#~ msgid "Email" -#~ msgstr "Netfang" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Bæta völdum hlutum við venslin" - -#~ msgid "unnamed" -#~ msgstr "ónefnt" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Árekstrar: {0}" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} hlutur hefur árekstra:" -#~ msgstr[1] "{0} hlutir hafa árekstra:" - -#~ msgid "sports" -#~ msgstr "íþróttir" - -#~ msgid "Ill-formed node id" -#~ msgstr "Illa-formað kenni á hnút" - -#~ 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ð?" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" - -#~ msgid "Remove Selected" -#~ msgstr "Fjarlægja val" - -#~ msgid "Revert" -#~ msgstr "Afturkalla" - -#~ msgid "Validate" -#~ msgstr "Athuga" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Athuga núverandi val eða öll gögn í laginu." - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." - -#~ msgid "Data Layer" -#~ msgstr "Gagnalag" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Leiðrétta stöðu WMS lagsins" - -#~ msgid "Occupied By" -#~ 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" - -#~ msgid "Move Down" -#~ msgstr "Færa niður" - -#~ msgid "Sort" -#~ msgstr "Raða" - -#~ msgid "Sort the selected relation members or the whole list" -#~ msgstr "Raða völdum meðlimum eða öllum listanum" - -#~ msgid "Members: {0} (linked: {1})" -#~ msgstr "Stök: {0} (tengd: {1})" - -#~ msgid "linked" -#~ msgstr "tengd" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." - -#~ 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 "Merge nodes with different memberships?" -#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?" Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 17707) +++ applications/editors/josm/i18n/po/it.po (revision 17708) @@ -5,6 +5,6 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 02:45+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:48+0000\n" "Last-Translator: FabC \n" "Language-Team: Italian \n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -191,5 +191,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -522,5 +522,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -655,13 +655,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -680,19 +678,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Chiusura del gruppo di modifiche..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -769,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Crea cerchio" @@ -777,9 +772,9 @@ msgstr "Crea un cerchio a partire da tre nodi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Questi nodi non sono disposti su una circonferenza. Annullo." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -792,5 +787,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -947,8 +942,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "il parametro ''{0}'' non deve essere nullo" @@ -1011,5 +1084,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Pagina di help mancante. Creala in italiano." @@ -1017,5 +1090,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1080,65 +1153,4 @@ msgid "Please select at least two nodes to merge." msgstr "Seleziona almeno due nodi da unire." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "il parametro ''{0}'' non deve essere nullo" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1845,7 +1857,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "gruppi di modifiche" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2262,7 +2273,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Inserire una stringa di ricerca." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2283,7 +2293,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "Aggiungi alla selezione" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2435,7 +2444,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2468,5 +2477,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2474,10 +2483,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2486,26 +2495,26 @@ "relazione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Token inaspettato: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Argomenti mancanti per l'operatore booleano OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Argomento mancante per l'operatore booleano NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Era attesa una parentesi chiusa." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2516,5 +2525,5 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2647,9 +2656,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" -msgstr "" +msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2661,5 +2670,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " @@ -2705,14 +2715,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Conflitto tra relazioni" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Elimina dalla relazione" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2721,5 +2731,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2728,5 +2738,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Dividi il segmento del percorso" @@ -2734,5 +2744,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2745,5 +2755,5 @@ "(che non puoi vedere).
Vuoi veramente cancellarli?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Conferma di cancellazione" @@ -2849,6 +2859,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}" @@ -3061,5 +3071,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3071,17 +3081,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "testo" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3090,7 +3097,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3182,5 +3188,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3852,7 +3858,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Utente" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4231,28 +4236,4 @@ msgstr[0] "Loro versione ({0} voce)" msgstr[1] "Loro versione ({0} voci)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "il parametro '{0}' non deve essere nullo" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4654,5 +4635,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4928,27 +4909,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Aggiungi la selezione" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Modifica passerella" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Elimina livello" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Sposta in alto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Sposta in basso" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4957,7 +4933,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Elementi singoli" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4970,7 +4945,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filtro" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5245,9 +5219,9 @@ msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Stacca il pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5256,5 +5230,5 @@ "degli strumenti a sinistra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" @@ -5389,5 +5363,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6856,17 +6830,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "gruppi di modifiche" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Crea aree" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Inserisci commento" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6875,28 +6846,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Changeset in chiusura" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Chiude il changeset corrente ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Changeset in chiusura" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6905,7 +6871,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Changeset in chiusura" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7217,7 +7183,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "carica tutte le modifiche in una sola richiesta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7235,17 +7200,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Usare un nuovo changset e lasciarlo aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Nessun changeset aperto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7254,14 +7216,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Nessun cambiamento da caricare." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next 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:895 @@ -7274,17 +7232,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Carica sul server le attuali preferenze" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "elimina le etichette correntemente selezionate" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7487,9 +7443,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} percorso, " -msgstr[1] "{0} percorsi, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7501,12 +7457,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Timespan/Arco di tempo: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Lunghezza: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8901,7 +8855,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8926,7 +8880,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9134,5 +9088,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Importazione NMEA non riuscita!" @@ -9185,7 +9139,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9275,7 +9229,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "attributo obbligatorio ''{0}'' mancante" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9284,23 +9238,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal 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/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric 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/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean 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/OsmChangesetParser.java:159 @@ -9334,7 +9282,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Chiusura del gruppo di modifiche..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9660,22 +9607,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Chiusura del gruppo di modifiche..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Chiusura del gruppo di modifiche..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Lettura di {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Scaricamento estensione {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9716,7 +9661,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9724,9 +9669,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" msgstr "" -"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto " -"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11147,7 +11090,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Imposta le coordinate di Lambert" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11352,5 +11295,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Importazione TangoGPS fallita!" @@ -12092,12 +12035,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -12107,7 +12049,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nodo" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12116,7 +12058,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Modalità: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12125,12 +12067,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versione {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Versione {0} creata il {1} da {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12148,9 +12090,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"L'estensione openstreetbus sta utilizzando il vecchio server appspot." +"L'estensione openstreetbugs sta utilizzando il vecchio server appspot." "com.
E' disponibile un nuovo server su schokokeks.org.
Si vuole " "migrare al nuovo server? (Fortemente consigliato)" @@ -13973,5 +13915,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14281,5 +14223,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14485,7 +14427,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "strada" +msgstr "" #. group "Highways" @@ -17120,7 +17061,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Trasporto pubblico" +msgstr "" #. group "Transport" @@ -17939,7 +17879,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "ghiaia" +msgstr "" #. group "Travel" @@ -18562,13 +18501,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Confini" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Modifica fermata dell'autobus" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19726,7 +19663,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Costruzioni umane" +msgstr "" #. group "Man-Made" @@ -21221,7 +21157,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Geografico" +msgstr "" #. group "Places" @@ -26301,22 +26236,6 @@ msgstr "" -#~ msgid "Close current changeset" -#~ msgstr "Chiude il changeset corrente" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Attualmente non ci sono changeset aperti." - -#~ msgid "- running version is {0}" -#~ msgstr "- la versione in esecuzione è {0}" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Usare un nuovo changset a chiuderlo." - -#~ 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" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "il parametro '{0}' non deve essere nullo" #~ msgid "Data Layer" @@ -26819,9 +26738,12 @@ #~ msgstr "Articoli sportivi" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "- running version is {0}" +#~ msgstr "- la versione in esecuzione è {0}" + +#~ msgid "Helppage missing. Create it in English." #~ msgstr "Pagina di aiuto mancante. Crearla in italiano." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26992,2 +26914,18 @@ #~ msgid "Delete all" #~ msgstr "Elimina tutto" + +#~ msgid "There is currently no changeset open." +#~ msgstr "Attualmente non ci sono changeset aperti." + +#~ msgid "Close current changeset" +#~ msgstr "Chiude il changeset corrente" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Usare un nuovo changset a chiuderlo." + +#~ 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" Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 17707) +++ applications/editors/josm/i18n/po/ja.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-19 04:53+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:28+0000\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -522,5 +522,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -651,13 +651,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -676,19 +674,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "変更した設定を閉じています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -762,5 +757,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "円形を作成します" @@ -770,9 +765,9 @@ msgstr "3つのノードから円形を作成します" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "これらのノードは、円の中にありません。中止します。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -785,5 +780,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -938,8 +933,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "パラメータ ''{0}'' はヌルでなければなりません" @@ -1003,5 +1076,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "ヘルプページがありません。英語で作成してください。" @@ -1009,5 +1082,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1070,65 +1143,4 @@ msgid "Please select at least two nodes to merge." msgstr "結合する少なくとも二つのウエイを選択してください。" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "パラメータ ''{0}'' はヌルでなければなりません" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1828,7 +1840,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "変更セット情報" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2238,7 +2249,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "検索文字列を入力してください" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2259,7 +2269,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "セレクションに加える" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2402,7 +2411,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2435,5 +2444,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2441,10 +2450,10 @@ "ださい: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2453,26 +2462,26 @@ "\"relation\"です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "想定外のトークン: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "閉じ括弧があるはずです。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2483,5 +2492,5 @@ "い、例えば ノード: 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2615,7 +2624,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2631,5 +2640,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" @@ -2670,14 +2680,14 @@ msgstr[0] "{0} のリレーションを削除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "競合中のリレーション" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "関連から削除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2688,5 +2698,5 @@ "
リレーションから削除しますか?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2697,5 +2707,5 @@ "ンから削除しますか？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "ウェイのセグメントを分割" @@ -2703,5 +2713,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2714,5 +2724,5 @@ "起こします。
本当に削除しますか？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "削除確認" @@ -2818,6 +2828,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "ウェイ {0} のノードリストの競合を解決" @@ -3047,5 +3057,5 @@ msgstr "変更セット {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3057,17 +3067,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "テキスト" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3076,7 +3083,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3172,5 +3178,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "このデータセットには id {0} のプリミティブはありません" @@ -3839,7 +3845,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "ユーザ" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4202,28 +4207,4 @@ msgid_plural "Their version ({0} entries)" msgstr[0] "相手のバージョン ({0} エントリ)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "パラメータ '{0}' はヌル以外でなければなりません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4622,5 +4603,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "キー ''{0}'' とその全ての値は削除されます" @@ -4892,27 +4873,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "選択したものを追加" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "桟橋の編集" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "レイヤー削除" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "上へ移動" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "下へ移動" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4921,7 +4897,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "単一の要素" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4934,7 +4909,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "フィルタ" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5209,9 +5183,9 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5220,5 +5194,5 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5354,5 +5328,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6842,17 +6816,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "変更セット情報" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "エリアの作成" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "変更セット情報" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6861,28 +6832,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "適用したいプロパティの変更を選択してください。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "変更セットを閉じています" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "現在の変更セットを閉じる ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "変更セットを閉じています" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6891,7 +6857,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "変更セット {0} を閉じています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6920,21 +6886,19 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "レイヤー ''{0}'' にはアップロードする修正はありません" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 -#, fuzzy, java-format +#, java-format msgid "" "Layer ''{0}'' has modifications which should be saved to its associated file " "''{1}''." msgstr "" -"レイヤー ''{0}'' は修正されているのでその関連ファイル ''{1}'' に保存する必要" -"があります。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "レイヤー ''{0}'' には保存する修正はありません" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 @@ -7211,7 +7175,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "一度のリクエストで全ての変更をアップロードしました。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7228,34 +7191,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "新しい変更セットのタグ" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "新しい変更セットを使用して開いたままにする" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "開かれている変更セットなし" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "新規または既存の変更セットにアップロードしますか？" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "アップロードする変更はありません。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next upload" msgstr "" -"選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後に" -"変更セットを閉じる" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 @@ -7268,17 +7223,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "履歴をサーバからリロード" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "現在選択されているタグを削除" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "ID > 0 である必要があります。 {0} を受け取りました" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7480,8 +7433,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} トラック " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7493,12 +7447,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Timespan: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "長さ: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8824,7 +8776,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8849,8 +8801,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" msgstr "" -"パラメータ ''{0}'' > 0 である必要がありますが、 ''{1}'' を受け取りました" #. SAXException does not chain correctly @@ -9058,5 +9009,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEAのインポートに失敗しました。" @@ -9109,7 +9060,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9166,7 +9117,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 -#, fuzzy, java-format +#, java-format msgid "Changeset id > 0 expected. Got {0}" -msgstr "ID > 0 である必要があります。 {0} を受け取りました" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 @@ -9198,7 +9149,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "必要な属性 ''{0}'' がありません" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9207,17 +9158,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" -msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" -msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" -msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9240,8 +9191,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176 -#, fuzzy, java-format +#, java-format msgid "Undefined element ''{0}'' found in input stream. Aborting." msgstr "" -"警告: 未定義の要素 ''{0}'' が入力ストリームに見つかりました。スキップします。" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 @@ -9252,7 +9202,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "変更した設定を閉じています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9454,8 +9403,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 -#, fuzzy, java-format +#, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -"警告: 未定義の要素 ''{0}'' が入力ストリームに見つかりました。スキップします。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 @@ -9572,22 +9520,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "変更セットを作成しています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "変更した設定を閉じています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "変更セット {0} を開いたままにします.." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "変更セット {0} を閉じています..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9626,7 +9572,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "XML 要素 {1} に必要な属性 ''{0}'' がありません" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9634,7 +9580,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" -msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11047,7 +10993,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "相手の座標を残す" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11243,5 +11189,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "TangoGPS のインポートに失敗しました。" @@ -11969,22 +11915,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0}ノード" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "ノード {0} を変更" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0}ノード" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11993,7 +11938,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "ウェイ {0} を追加" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12002,12 +11947,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "バージョン{0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "バージョン {0} 作成日: {1} 作成者: {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12025,9 +11970,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"openstreetbus プラグインは appspot.com の古いサーバを使用しています。" +"openstreetbugs プラグインは appspot.com の古いサーバを使用しています。" "
schokokeks.org の新しいサーバが利用できます。
新しいサーバに切り換えま" "すか？ (強く推奨)" @@ -13772,5 +13717,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14057,5 +14002,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14239,7 +14184,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "道路" +msgstr "" #. group "Highways" @@ -16877,7 +16821,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "公共交通機関" +msgstr "" #. group "Transport" @@ -17696,7 +17639,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "砂利道" +msgstr "" #. group "Travel" @@ -18319,13 +18261,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "境界線" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "本屋を編集" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19484,7 +19424,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "人工物" +msgstr "" #. group "Man-Made" @@ -26057,68 +25996,6 @@ msgstr "チェコ UHUL:ORTOFOTO" -#~ msgid "Close current changeset" -#~ msgstr "現在の変更セットを閉じる" - -#~ msgid "There is currently no changeset open." -#~ msgstr "現在開かれている変更セットはありません。" - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "パラメータ''{0}'' はヌルでなければなりません" - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" - -#~ msgid "- running version is {0}" -#~ msgstr "- 起動中のバージョンは {0} です。" - -#~ msgid "not yet decided" -#~ msgstr "未決定です" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "新しい変更セットを使用して閉じる" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" -#~ "に変更セットを閉じる" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to close the changeset " -#~ "after this upload" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" -#~ "トを閉じる" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" -#~ "めに変更セットを開いておく" - -#~ msgid "Changeset {0} is unchanged. Skipping update." -#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" - -#~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the " -#~ "id of the current changeset is 0" -#~ msgstr "" -#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" -#~ "セットのIDが 0 です。" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" -#~ "見つかりません。" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" #~ msgid "Move" @@ -26514,5 +26391,5 @@ #~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" #~ "ヘルプページがありません。英語でそれを作成してくださ" @@ -26520,9 +26397,12 @@ #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" #~ "ヘルプページがありません。英語もしくは" #~ "あなたの母国語でそれを作成してください。" + +#~ msgid "- running version is {0}" +#~ msgstr "- 起動中のバージョンは {0} です。" #~ msgid "Invalid projection" @@ -26603,4 +26483,43 @@ #~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" +#~ msgid "There is currently no changeset open." +#~ msgstr "現在開かれている変更セットはありません。" + +#~ msgid "Close current changeset" +#~ msgstr "現在の変更セットを閉じる" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "新しい変更セットを使用して閉じる" + +#~ msgid "" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" +#~ msgstr "" +#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" +#~ "に変更セットを閉じる" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to close the changeset " +#~ "after this upload" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" +#~ "トを閉じる" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to leave the changeset " +#~ "open for further uploads" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" +#~ "めに変更セットを開いておく" + +#~ msgid "Changeset {0} is unchanged. Skipping update." +#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" + #~ msgid "No currently open changeset. Opening a new changeset..." #~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." @@ -26615,6 +26534,29 @@ #~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" +#~ msgid "" +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" +#~ msgstr "" +#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" +#~ "セットのIDが 0 です。" + +#~ msgid "not yet decided" +#~ msgstr "未決定です" + #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "" #~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" #~ "た。" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "パラメータ''{0}'' はヌルでなければなりません" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" +#~ "見つかりません。" Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 17707) +++ applications/editors/josm/i18n/po/nb.po (revision 17708) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" "PO-Revision-Date: 2009-08-15 13:39+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -643,13 +643,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -673,13 +671,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -752,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Lag en sirkel" @@ -760,9 +756,9 @@ msgstr "Lag en sirkel fra tre valgte noder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Disse nodene er ikke i en sirkel. Avbryter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -775,5 +771,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -928,9 +924,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parameter «{0}» må ha en verdi" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -991,5 +1065,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Hjelpeside mangler. Opprett den på engelsk." @@ -997,5 +1071,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1058,65 +1132,4 @@ msgid "Please select at least two nodes to merge." msgstr "Velg minst to noder til å samle" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter «{0}» må ha en verdi" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1797,7 +1810,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2207,7 +2219,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Skriv inn søketekst." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2228,7 +2239,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "legg til i utvalg" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2372,7 +2382,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2404,41 +2414,41 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 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:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, 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:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Uventet symbol: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "OR mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "NOT mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Forventer parentes slutt." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2449,5 +2459,5 @@ "intervall, for eksempel nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2580,9 +2590,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" -msgstr "" +msgstr "allerede registrert en konflikt for primitiv \"{0}\"" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2594,5 +2604,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " @@ -2638,14 +2649,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relasjonen har konflikter" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Slett fra relasjon" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2654,5 +2665,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2661,5 +2672,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Splitt linje i segment" @@ -2667,5 +2678,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2678,5 +2689,5 @@ "nå) .
Er du sikker på at du vil slette nodene?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2784,6 +2795,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Løs nodekonflikter i vei {0}" @@ -2995,5 +3006,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3005,17 +3016,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "tekst" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3024,7 +3032,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3116,5 +3123,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" @@ -3786,7 +3793,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Bruker" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4165,28 +4171,4 @@ msgstr[0] "Tjenerens versjon ({0} oppføring)" msgstr[1] "Tjenerens versjon ({0} oppføringer)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parameter «{0}» må ha en verdi" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4583,5 +4565,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4854,27 +4836,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Legg til utvalgte" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Rediger brygge" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Slett Lag" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Flytt opp" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Flytt ned" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4883,7 +4860,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Enkelte element" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4896,7 +4872,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5171,14 +5146,14 @@ msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" @@ -5311,5 +5286,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6779,17 +6754,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Tegn områder" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Skift relasjon" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6798,28 +6770,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Velg hvilke endringer som skal brukes." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Lukker endringssett …" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Slett valgte objekter." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Lukker endringssett …" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6828,7 +6795,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7140,7 +7107,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Last opp alle endringer til OSM-tjeneren." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7155,7 +7121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "endringssett" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7164,7 +7129,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Ulagrede endringer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7173,7 +7137,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Ingen endringer å laste opp." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7190,17 +7153,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Last opp aktive innstillinger til tjener" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Flytt valgte medlem opp" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "parameter «{0}» > 0 forventet – leste «{1}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7403,9 +7364,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} spor, " -msgstr[1] "{0} spor, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7417,12 +7378,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Tidshorisont: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Lengde: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8776,7 +8735,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Bruk objektmal «{0}» i gruppe «{1}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8801,7 +8760,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter «{0}» > 0 forventet – leste «{1}»" +msgstr "" #. SAXException does not chain correctly @@ -9008,5 +8967,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Feil ved import av NMEA data!" @@ -9056,7 +9015,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "parameter {0} > 0 nødvendig. Leste {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9145,7 +9104,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "obligatorisk attributt «{0}» mangler" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9154,20 +9113,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9201,7 +9157,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9524,22 +9479,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Lukker endringssett …" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Leser {0} …" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Laster ned programtillegg {0} …" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9579,7 +9532,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Bruk objektmal «{0}» i gruppe «{1}»" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9587,8 +9540,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -10983,7 +10935,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Behold tjenerens koordinater" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11183,5 +11135,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Klarte ikke importere TangoGPS-data." @@ -11914,12 +11866,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Velg en eller flere lukkede linjer med minst fire noder." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} node" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11929,7 +11880,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} node" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11938,7 +11889,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Modus: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11947,12 +11898,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versjon {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Versjon {0} lagt til {1} av {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11970,5 +11921,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13742,5 +13693,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14034,5 +13985,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14226,7 +14177,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "ferdselsvei" +msgstr "" #. group "Highways" @@ -16861,7 +16811,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Offentlig transport" +msgstr "" #. group "Transport" @@ -17680,7 +17629,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "grus" +msgstr "" #. group "Travel" @@ -18303,13 +18251,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Grenser" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Rediger bussholdeplass" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19467,7 +19413,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Menneskeskapt" +msgstr "" #. group "Man-Made" @@ -26040,6 +25985,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- aktive versjon er {0}" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter «{0}» må ha en verdi" #~ msgid "Move" @@ -26052,12 +25997,12 @@ #~ msgstr "E-post" -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Hjelp mangler. Kan lages i english." +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "Hjelp mangler. Kan lages i English." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Hjelp mangler. Kan lages i english ellerr English ellerr norsk bokmål." @@ -26497,4 +26442,7 @@ #~ msgstr "linjer" +#~ msgid "- running version is {0}" +#~ msgstr "- aktive versjon er {0}" + #~ msgid "Contacting the OSM server..." #~ msgstr "Kontakter OSM-tjeneren …" Index: applications/editors/josm/i18n/po/nl.po =================================================================== --- applications/editors/josm/i18n/po/nl.po (revision 17707) +++ applications/editors/josm/i18n/po/nl.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 04:44+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:14+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -642,13 +642,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -667,19 +665,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Server ondersteunt geen changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -756,5 +751,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Cirkel aanmaken" @@ -764,9 +759,9 @@ msgstr "Een cirkel uit drie knopen maken." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -779,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -932,8 +927,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "Parameter \"{0}\" mag niet leeg zijn." @@ -995,5 +1068,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -1001,5 +1074,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1060,65 +1133,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1804,7 +1816,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Waarden aanpassen?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2210,7 +2221,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Voer een zoekopdracht in:" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2231,7 +2241,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "Toevoegen aan selectie" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2372,7 +2381,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2405,40 +2414,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Onverwacht token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Ontbrekende argumenten voor OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Ontbrekend argument voor NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Sluithaak verwacht." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2447,5 +2456,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2580,5 +2589,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2592,5 +2601,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2634,14 +2644,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Conflicterende relatie" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Uit relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2650,5 +2660,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2657,5 +2667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Wegsegment splitsen" @@ -2663,5 +2673,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2674,5 +2684,5 @@ "niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2778,7 +2788,7 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" +msgstr "Conflicten in verwijderde toestand oplossen in {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 @@ -2990,5 +3000,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3000,17 +3010,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "tekst" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3019,7 +3026,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3111,5 +3117,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3783,7 +3789,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Gebruiker" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4138,28 +4143,4 @@ msgstr[0] "Hun versie ({0} invoer)" msgstr[1] "Hun versie ({0} invoeren)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parameter '{0}' mag niet leeg zijn" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4544,5 +4525,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4819,27 +4800,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Selectie toevoegen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Pier bewerken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Laag verwijderen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Omhoog verplaatsen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Omlaag verplaatsen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4848,7 +4824,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Individuele elementen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4861,7 +4836,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Verwijdermodus" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5136,9 +5110,9 @@ msgstr "Selectie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Laat paneel drijven" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5147,5 +5121,5 @@ "werkbalk." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Klik om de paneelinhoud te verkleinen/vergroten" @@ -5278,5 +5252,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6743,17 +6717,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Relatie wijzigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Gebieden aanmaken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Opmerking bevestigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6762,28 +6733,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Changeset sluiten" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Geselecteerde objecten verwijderen." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Changeset sluiten" +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6792,7 +6758,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7104,7 +7070,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Upload alle aanpassingen naar de OSM-server." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7127,7 +7092,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Niet-opgeslagen wijzigingen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7136,7 +7100,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Geen aanpassingen aanwezig om te uploaden." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7153,12 +7116,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "De huidige voorkeuren naar de server uploaden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "De geselecteerde leden omhoog verplaatsen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7366,9 +7327,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} track, " -msgstr[1] "{0} tracks, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7380,12 +7341,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Tijdsperiode: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Lengte: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8756,7 +8715,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8781,7 +8740,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "Parameter \"{0}\" mag niet leeg zijn." +msgstr "" #. SAXException does not chain correctly @@ -8985,5 +8944,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Importeren NMEA is mislukt!" @@ -9174,7 +9133,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9484,22 +9442,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Lezen {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Changeset sluiten" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9539,7 +9495,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10931,7 +10887,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Hun coördinaten houden" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11131,5 +11087,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11863,12 +11819,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} knoop" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11878,7 +11833,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} knoop" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11887,7 +11842,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Modus: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11896,7 +11851,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versie {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11919,5 +11874,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13683,5 +13638,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13960,5 +13915,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14134,7 +14089,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "snelweg" +msgstr "" #. group "Highways" @@ -16769,7 +16723,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Openbaar vervoer" +msgstr "" #. group "Transport" @@ -17588,7 +17541,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "gravel" +msgstr "" #. group "Travel" @@ -18211,13 +18163,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Grenzen" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Bushalte bewerken" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19375,7 +19325,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Bouwwerken" +msgstr "" #. group "Man-Made" @@ -25948,6 +25897,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- uitgevoerde versie is {0}" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter '{0}' mag niet leeg zijn" #~ msgid "Unknown version" @@ -26447,6 +26396,9 @@ #~ msgstr "Valhek bewerken" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "Help-pagina ontbreekt. Maak het in nederlands." + +#~ msgid "- running version is {0}" +#~ msgstr "- uitgevoerde versie is {0}" #~ msgid "" Index: applications/editors/josm/i18n/po/pl.po =================================================================== --- applications/editors/josm/i18n/po/pl.po (revision 17707) +++ applications/editors/josm/i18n/po/pl.po (revision 17708) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-19 10:21+0000\n" -"Last-Translator: pp/bs \n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:32+0000\n" +"Last-Translator: Dirk Stöcker \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-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -152,5 +152,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -194,5 +194,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -519,5 +519,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -646,13 +646,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -671,19 +669,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Serwer nie wspiera wersjonowania" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -758,5 +753,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Utwórz okrąg" @@ -766,9 +761,9 @@ msgstr "Tworzy okrąg na podstawie trzech zaznaczonych węzłów." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -781,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -936,9 +931,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "parametr {0} nie może być wartością null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' nie może być pusty (null)" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -999,5 +1072,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Brak strony pomocy. Utwórz ją w języku angielskim." @@ -1005,5 +1078,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1066,65 +1139,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' nie może być pusty (null)" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1804,7 +1816,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Zmienić wartości?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2207,7 +2218,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Podaj proszę czego szukać." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2228,7 +2238,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "dodaj do zaznaczenia" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2368,7 +2377,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2397,40 +2406,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Brak argumentów dla operator lub." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Brak argumentu dla operatora nie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Brak nawiasu zamykającego." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2439,5 +2448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2573,5 +2582,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2585,5 +2594,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2627,14 +2637,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Sprzeczne relacje" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Usuń z relacji" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2643,5 +2653,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2650,5 +2660,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Rozdziel segmenty drogi" @@ -2656,5 +2666,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2667,5 +2677,5 @@ "węzłów.
Czy naprawdę zamierzasz je usunąć?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Potwierdź usunięcie." @@ -2772,5 +2782,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2982,5 +2992,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2992,12 +3002,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "tekst" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "WC" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3101,5 +3109,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3760,7 +3768,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Użytkownik" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4112,28 +4119,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4518,5 +4501,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4791,27 +4774,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Dodaj zaznaczone" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Edycja molo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Usuń warstwę" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Przesuń do góry" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Przesuń w dół" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4820,7 +4798,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Pojedyncze elementy" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4833,7 +4810,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Tryb kasowania" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5110,9 +5086,9 @@ msgstr "Zaznaczenie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Oderwij panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5120,5 +5096,5 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" @@ -5251,5 +5227,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6715,17 +6691,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Zmień relację" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Tworzenie obszarów." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Komentarz zmiany" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6734,28 +6707,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Wybierz, które właściwości chcesz zmienić." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Usuwa wybrane obiekty" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Zamykanie zestawu zmian..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6764,7 +6732,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7076,7 +7044,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Załadunek wszystkich zmian w jednym żądaniu." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7099,7 +7066,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Niezapisane zmiany" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7108,7 +7074,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Brak zmian do wysłania." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7125,12 +7090,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Wyślij bieżące ustawienia na serwer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Przesuń aktualnie zaznaczonych członkół w górę" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7339,10 +7302,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} ślad, " -msgstr[1] "{0} ślady, " -msgstr[2] "{0} śladów, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7354,12 +7316,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Okres czasu: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Długość: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8683,7 +8643,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8708,7 +8668,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter ''{0}'' nie może być pusty (null)" +msgstr "" #. SAXException does not chain correctly @@ -8913,5 +8873,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Import NMEA zakończony niepowodzeniem!" @@ -9102,7 +9062,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9411,22 +9370,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Wczytywanie {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Zamykanie zestawu zmian..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9467,7 +9424,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10839,7 +10796,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Zerowe współrzędne: " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11033,5 +10990,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11751,14 +11708,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej " -"czterech węzłach." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} węzeł" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11768,7 +11722,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} węzeł" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11777,7 +11731,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Tryb: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11786,7 +11740,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Wersja {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11809,5 +11763,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13535,5 +13489,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13806,5 +13760,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13982,7 +13936,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "droga" +msgstr "" #. group "Highways" @@ -16617,7 +16570,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Transport publiczny" +msgstr "" #. group "Transport" @@ -17436,7 +17388,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "żwir" +msgstr "" #. group "Travel" @@ -18059,13 +18010,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Granice" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Edycja przystanku autobusowego" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19223,7 +19172,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Obiekty sztuczne" +msgstr "" #. group "Man-Made" @@ -25796,7 +25744,4 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- używasz wersji {0}" - #~ msgid "Move" #~ msgstr "Przenieś" @@ -26105,10 +26050,10 @@ #~ msgstr "Wszystkie trasy są puste" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" #~ "Brak strony pomocy. Możesz ją utworzyć po angielsku." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" @@ -26132,4 +26077,7 @@ #~ msgstr[2] "{0} obiektów ma konflikt:" +#~ msgid "- running version is {0}" +#~ msgstr "- używasz wersji {0}" + #~ msgid "Delete and Download" #~ msgstr "Usuń i pobierz" Index: applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- applications/editors/josm/i18n/po/pt_BR.po (revision 17707) +++ applications/editors/josm/i18n/po/pt_BR.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 03:52+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:02+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Brazilian Portuguese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -189,5 +189,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -516,5 +516,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -648,13 +648,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -678,13 +676,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -761,5 +757,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Criar Círculo" @@ -769,9 +765,9 @@ msgstr "Criar círculo a partir de três nós selecionados." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Os nós não estão em circulo. Abortando." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -784,5 +780,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -938,9 +934,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "parâmetro \"{0}\" não pode ser vazio" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parâmetro ''{0}'' não pode ser nulo" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1001,5 +1075,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Faltando página de Ajuda. Crie uma em português." @@ -1007,8 +1081,8 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" -"Página de ajuda. Crie-a em english ou English ou português." @@ -1069,65 +1143,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parâmetro ''{0}'' não pode ser nulo" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1826,7 +1839,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2238,7 +2250,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Por favor, entre com uma string de busca." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2259,7 +2270,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "adiciona à seleção" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2403,7 +2413,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nada adicionado à seleção pela busca por \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2436,5 +2446,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2442,10 +2452,10 @@ "chave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2454,26 +2464,26 @@ "ou relação." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autenticação inesperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Faltam argumentos para \"or\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Falta argumento para \"not\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Fechamento de parenteses esperado." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2484,5 +2494,5 @@ "de nós ou um intervalo, por exemplos, os nós:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2615,9 +2625,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" -msgstr "" +msgstr "já registrado um conflito para a primitiva \"{0}\"" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2629,5 +2639,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " @@ -2673,14 +2684,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relação conflitando" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Deletar da relação" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2689,5 +2700,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2696,5 +2707,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Dividir segmento de via" @@ -2702,5 +2713,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2713,5 +2724,5 @@ "
Realmente quer apagar?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Apagar confirmação" @@ -2819,6 +2830,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Resolver conflitos na lista de nós do caminho {0}" @@ -3030,5 +3041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3040,17 +3051,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "texto" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3059,7 +3067,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3151,5 +3158,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." @@ -3826,7 +3833,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Usuário" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4205,28 +4211,4 @@ msgstr[0] "Sua versão ({0} entrada)" msgstr[1] "Sua versão ({0} entradas)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parâmetro '{0}' não pode ser nulo" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4628,5 +4610,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4901,27 +4883,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Adicionar Selecionado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Editar Abrigo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Excluir Camada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Mover para cima" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Mover para baixo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4930,7 +4907,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Mover elementos" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4943,7 +4919,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filtro" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5218,9 +5193,9 @@ msgstr "Seleção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Desacoplar painel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5228,5 +5203,5 @@ "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Clique para minimizar/maximizar o conteúdo do painel" @@ -5359,5 +5334,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6837,17 +6812,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Criar áreas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Modificar relação" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6856,28 +6828,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Por favor, selecione quais alterações de propriedades quer aplicar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Fechando conjunto de mudanças..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Excluir os objetos selecionados." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Fechando conjunto de mudanças..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6886,7 +6853,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7198,7 +7165,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "enviar todas modificações em um pedido" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7215,7 +7181,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "conjunto de mudanças" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7224,7 +7189,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Alterações Não Salvas" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7233,7 +7197,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Não há modificações a enviar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7250,17 +7213,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Enviar as preferências atuais para o servidor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Apagar tags selecionadas atuais" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7463,9 +7424,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} trilha, " -msgstr[1] "{0} trilhas, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7477,12 +7438,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Intervalo de Tempo: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Comprimento: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8799,7 +8758,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Usar preferência ''{0}'' do grupo ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8824,7 +8783,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9028,5 +8987,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "falha na importação NMEA" @@ -9075,7 +9034,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "parametro {0} > 0 necessário. Obtido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9217,7 +9176,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9526,22 +9484,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Lendo {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Fechando conjunto de mudanças..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9582,7 +9538,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Usar preferência ''{0}'' do grupo ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10954,7 +10910,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Mantenha suas coordenadas" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11147,5 +11103,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11865,13 +11821,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nó" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11881,7 +11835,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nó" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11890,7 +11844,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Modo: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11899,12 +11853,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versão {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Verção {0} creado do {2} no {1}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11922,5 +11876,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13637,5 +13591,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13908,5 +13862,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14082,7 +14036,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "rodovia" +msgstr "" #. group "Highways" @@ -16717,7 +16670,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Transporte Público" +msgstr "" #. group "Transport" @@ -17536,7 +17488,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "pedras" +msgstr "" #. group "Travel" @@ -18159,13 +18110,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Fronteiras" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Editar Ponto de Ônibus" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -20817,7 +20766,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "Geografia WGS84" +msgstr "" #. group "Places" @@ -25896,6 +25844,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- versão em execução é {0}" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parâmetro '{0}' não pode ser nulo" #~ msgid "Unknown version" @@ -26177,4 +26125,7 @@ #~ "Não faça o upload de nenhuma informação depois desta mensagem." +#~ msgid "- running version is {0}" +#~ msgstr "- versão em execução é {0}" + #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" Index: applications/editors/josm/i18n/po/ro.po =================================================================== --- applications/editors/josm/i18n/po/ro.po (revision 17707) +++ applications/editors/josm/i18n/po/ro.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 04:57+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:12+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-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -151,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -193,5 +193,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -518,5 +518,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -676,7 +676,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Descarc datele OSM..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -749,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "" @@ -757,9 +756,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -770,5 +769,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -923,8 +922,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "" @@ -986,5 +1063,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -992,5 +1069,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1050,65 +1127,4 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 msgid "Please select at least two nodes to merge." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" msgstr "" @@ -1772,7 +1788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Schimb valorile?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2166,7 +2181,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Vă rog introduceţi un şir de căutat" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2187,7 +2201,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "adaugă la selecţie" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2354,40 +2367,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2396,5 +2409,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2530,5 +2543,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2542,5 +2555,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2584,14 +2598,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2600,5 +2614,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2607,5 +2621,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2613,5 +2627,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2621,5 +2635,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2726,5 +2740,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2934,5 +2948,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3051,5 +3065,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3710,7 +3724,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Nume utilizator" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4062,28 +4075,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4468,5 +4457,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4751,7 +4740,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Şterge" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 @@ -5055,14 +5043,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5195,5 +5183,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6656,7 +6644,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Schimbă" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 @@ -6673,8 +6660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" msgstr "" -"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 @@ -6688,10 +6673,9 @@ #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Mută nodurile selectate într-o linie." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -msgid "Cancel closeing of changesets" +msgid "Cancel closing of changesets" msgstr "" @@ -6701,7 +6685,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Ultima modificare la {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7013,7 +6997,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Trimite toate schimbările la serverul OSM." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7036,7 +7019,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Modificări nesalvate" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7045,7 +7027,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Nu sunt schimbări de transmis." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7066,7 +7047,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7275,10 +7255,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "urmă" -msgstr[1] "urme" -msgstr[2] "de urme" +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -8825,5 +8804,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "" @@ -9324,22 +9303,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Citesc {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Descarc..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Citesc {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Descarc punctele {0} până la {1}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -10902,5 +10879,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11620,7 +11597,6 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Selectează te rog cel puţin două căi pentru a le combina." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 @@ -11653,7 +11629,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Versiune {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11676,5 +11652,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13391,5 +13367,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13662,5 +13638,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -17288,7 +17264,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Salvează" +msgstr "" #. group "Travel" Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 17707) +++ applications/editors/josm/i18n/po/ru.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-19 07:38+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-20 08:19+0000\n" "Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" @@ -17,5 +17,5 @@ "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-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -157,5 +157,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -199,5 +199,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -388,5 +388,5 @@ msgstr "" "Пожалуйста, выберите по крайней мере одну уже загруженную точку, линию или " -"связь." +"отношение." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 @@ -533,5 +533,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -665,13 +665,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Нет открытого пакета изменений" +msgstr "Закрыть открытые пакеты изменений" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Нет открытого пакета изменений" +msgstr "Закроет открытые пакеты изменений" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -690,19 +688,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Нет открытого пакета изменений" +msgstr "Пакеты изменений не открыты" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Нет открытого пакета изменений" +msgstr "Нет открытых пакетов изменений" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Закрывается список правок..." +msgstr "Скачиваение открытых пакетов изменений ..." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -778,5 +773,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Создать окружность" @@ -786,9 +781,9 @@ msgstr "Создать окружность по трём выделенным точкам" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Эти узлы не в круге. Операция прервана." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -799,5 +794,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -952,9 +947,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "параметр ''{0}'' не должен быть нулевым" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "параметр ''{0}'' не должен быть null" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1015,5 +1088,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" "Страница справки отсутствует. Создайте её на английском." @@ -1022,5 +1095,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1035,5 +1108,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "Показать информацию истории о OSM линиях, точках или связях." +msgstr "Показать историю линий, точек или отношений OSM." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 @@ -1044,5 +1117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "Показать информацию об объектах о OSM линиях, точках или связях." +msgstr "Показать информацию об объектах о OSM: линиях, точках или отношениях." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -1083,65 +1156,4 @@ msgid "Please select at least two nodes to merge." msgstr "Пожалуйста, выберите как минимум две точки для объединения." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "параметр ''{0}'' не должен быть null" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1589,4 +1601,7 @@ "should verify this and correct it when necessary." msgstr "" +"Роль, основанная на участии в отношениях была скопирована во все новые " +"линии.
Результат необходимо проверить и исправить, если потребуется." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 @@ -1595,4 +1610,6 @@ "this and correct it when necessary." msgstr "" +"Член отношения был скопирован во все новые линии.
Результат " +"необходимо проверить и исправить, если потребуется." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 @@ -1812,11 +1829,11 @@ msgstr "" "Загрузка прервана так как на сервере есть более новая " -"версия одной
из ваших точек, путей или отношений.
Причиной конфликта " +"версия одной
из ваших точек, линий или отношений.
Причиной конфликта " "является {0} с id {1},
версия данных на " "сервере {2}, ваша версия {3}.

Нажмите {4} что бы " -"синхронизировать только конфликтный примитив.
Нажмите {5} что бы синхронизировать весь локальный набор данных с сервером." -"
Нажмите {6} что бы прекратить и продолжить " -"редактирование.
" +"синхронизировать только конфликтный элемент.
Нажмите {5} " +"что бы синхронизировать весь локальный набор данных с сервером.
Нажмите " +"{6} чтобы прервать, затем продолжите редактирование.
" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 @@ -1841,8 +1858,8 @@ msgstr "" "Ошибка обновления, так как на сервере имеется более " -"новая версия одного
из ваших узлов, путей или отношений.

. " +"новая версия одной
из ваших точек, линий или отношений.

. " "Нажмите на {0} для синхронизации локальных данных с " -"сервером.
Нажмите {1} для прерывания и продолжения " -"редактирования.
" +"сервером.
Нажмите {1} чтобы прервать, затем продолжите " +"редактирование.
" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 @@ -1852,9 +1869,12 @@ "again with a new or an existing open changeset." msgstr "" +"Загрузка не удалась потому что вы " +"используете
пакет изменений {0}, который был уже закрыт в {1}." +"
Пожалуйста, загрузите еще раз новый или существующий открытый пакет " +"изменений." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "наборы изменений" +msgstr "Пакет изменений закрыт" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2273,7 +2293,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Пожалуйста, введите строку для поиска." +msgstr "Пожалуйста, введите строку фильтра" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2294,7 +2313,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "добавить к выделению" +msgstr "найти в выбранном" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2345,5 +2363,6 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "type: - тип объекта (node, way, relation)" +msgstr "" +"тип: - тип объекта (точка, линия, отношение)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 @@ -2420,5 +2439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "Submit filter" -msgstr "" +msgstr "Принять фильтр" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 @@ -2442,7 +2461,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" +msgstr "Ничего не найдено для выбранного ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2474,5 +2493,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2480,37 +2499,38 @@ "использования: ключ=значение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -"Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +"Неизвестный тип элемента: {0}. Разрешенные значения: точка, линия или " +"отношение" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Неожиданный знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Отсутствуют параметры для \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Отсутствуют параметры для \"НЕ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Отсутствует закрывающая скобка" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "Неверное число параметров для оператора точек." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2521,5 +2541,5 @@ "или диапазон, например, 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2655,7 +2675,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2671,5 +2691,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" @@ -2713,18 +2734,18 @@ msgid "Delete {0} relation" msgid_plural "Delete {0} relations" -msgstr[0] "Удалить {0} отношение" -msgstr[1] "Удалить {0} отношения" -msgstr[2] "Удалить {0} отношений" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +msgstr[0] "Удалить отношение {0}" +msgstr[1] "Удалить отношения {0}" +msgstr[2] "Удалить отношения {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Конфликтующее отношение" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" -msgstr "Удалить из связи" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +msgstr "Удалить из отношения" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2732,8 +2753,8 @@ "from relation?" msgstr "" -"Выбранный объект \"{0}\" является частью отношения \"{1}\" в роли {2}." +"Выбранный объект \"{0}\" используется в отношении \"{1}\" в роли {2}." "
Удалить из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2741,8 +2762,8 @@ "" msgstr "" -"Выбранный объект \"{0}\" является частью отношения \"{1}\".
Удалить " +"Выбранный объект \"{0}\" используется в отношении \"{1}\".
Удалить " "из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Разделить сегмент линии" @@ -2750,5 +2771,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2761,5 +2782,5 @@ "использовать их.
Вы действительно хотите удалить их?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Удалить подтверждение" @@ -2799,5 +2820,5 @@ #, java-format msgid "removing reference from relation {0}" -msgstr "удаление ссылки из связи {0}" +msgstr "удаление ссылки из отношения {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -2846,5 +2867,5 @@ #, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Разрешить {0} конфликтующих тегов в отношении {1}" +msgstr "Разрешить конфликты тега {0} в отношении {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2866,9 +2887,9 @@ #, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "Разрешить конфликт версий для отношения {0}" +msgstr "Разрешить конфликты версии для отношения {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Устранить конфликты в списке точек линии {0}" @@ -3100,5 +3121,5 @@ msgstr "Пакет изменений {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3110,17 +3131,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "текст" +msgstr "Текст" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3129,7 +3147,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3223,5 +3240,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Примитив с id {0} не был найден в этом наборе данных" @@ -3260,5 +3277,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 msgid "Empty member in relation." -msgstr "В отношении имеется пустой член." +msgstr "В отношении имеется пустой участник." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 @@ -3266,5 +3283,5 @@ #, java-format msgid "Deleted member ''{0}'' in relation." -msgstr "В отношении «{0}» имеется член, который был удален." +msgstr "В отношении «{0}» имеется участник, который был удален." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 @@ -3904,7 +3921,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Пользователь" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4043,5 +4059,5 @@ "relation" msgstr "" -"Сведённый список участников отношения заморожен. Нет неразрешённых " +"Объединённый список участников отношения заморожен. Нет неразрешённых " "конфликтов в списке участников этого отношения" @@ -4282,28 +4298,4 @@ msgstr[2] "Их версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "параметр '{0}' не должен быть null" - #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 @@ -4378,6 +4370,6 @@ "" msgstr "" -"Существует {0} дополнительных примитива связанных с отношением {1}" -"
, которые удалены с сервера.

Вы хотите восстановить их тоже?Существуют дополнительне элементы ( {0} шт.), связанные с отношением " +"{1}
, которые удалены с сервера.

Вы хотите восстановить их тоже?" @@ -4702,5 +4694,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Ключ ''{0}'' и все его значения будут удалены" @@ -4767,7 +4759,7 @@ msgid "{0} relation" msgid_plural "{0} relations" -msgstr[0] "{0} отношение" -msgstr[1] "{0} отношения" -msgstr[2] "{0} отношений" +msgstr[0] "отношение для {0}" +msgstr[1] "отношения для {0}" +msgstr[2] "отношения для {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 @@ -4802,5 +4794,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53 msgid "Remove this relation member from the relation" -msgstr "Удалить это отношение из отношения" +msgstr "Удалить этого участника из отношения" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37 @@ -4827,5 +4819,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 msgid "Tag modified relations with " -msgstr "" +msgstr "Тег изменённых отношений с " #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68 @@ -4976,27 +4968,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Добавить выбранное" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Править пирс" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Удалить мои" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Переместить вверх" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Переместить вниз" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -5005,7 +4992,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Отдельные элементы" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -5018,7 +5004,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Фильтр" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5295,9 +5280,9 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Отсоединить панель" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5306,5 +5291,5 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" @@ -5440,5 +5425,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6889,17 +6874,19 @@ "{2} in changeset {3}" msgstr "" +"Версия {0} была создана в {1} " +"автором {2} в пакете изменений {3}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 msgid "Changeset info" -msgstr "" +msgstr "Информация о пакете изменений" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Launch browser with information about the changeset" -msgstr "" +msgstr "Открыть браузер с информацией о пакете изменений" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 #, java-format msgid "Show changeset {0}" -msgstr "" +msgstr "Показать пакет изменений {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6913,17 +6900,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Пакет изменений {0}" +msgstr "Идентификатор пакета изменений:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Создание областей" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Пакет изменений {0}" +msgstr "Комментарий пакета изменений" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6932,28 +6916,24 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Пожалуйста, выберите, какие параметры нужно изменить." +msgstr "" +"Пожалуйста, выберите пакеты изменений, которые хотите закрыть" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Нет открытого пакета изменений" +msgstr "Открыть пакеты изменений" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Закрытие пакета изменений" +msgstr "Закрыть пакеты изменений" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Закрыть текущий пакет изменений ..." +msgstr "Закрыть выбранные открытые пакеты изменений" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Закрытие пакета изменений" +msgid "Cancel closing of changesets" +msgstr "Отменить закрытие пакетов изменений" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6962,7 +6942,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Закрытие пакета изменений" +msgstr "Закрытие пакета изменений {0}" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7267,4 +7247,6 @@ msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" +"Пожалуйста, введите комментарий для этой загрузки пакета изменений (мин. 3 " +"символа)" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479 @@ -7277,7 +7259,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Выгрузить все изменения за один запрос" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7294,34 +7275,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Теги нового пакета изменений" +msgstr "Открыть новый пакет изменений" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Использовать новый пакет изменений и оставить его открытым" +msgstr "Открыть новый пакет изменений и использовать его в следующей загрузке" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Нет открытого пакета изменений" +msgstr "Использовать открытый пакет изменений" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Выгрузить в новый или существующий пакет изменений?" +msgstr "Загрузить данные в уже открытый пакет изменений" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Нет изменений для загрузки." +msgstr "Закрыть пакет изменений после загрузки" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next upload" -msgstr "" -"Выберите, чтобы выгрузить данные в новый пакет изменений, и закрыть его " -"после загрузки." +msgstr "Выбрать, какой пакет изменений надо закрыть, после следующей загрузки" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 @@ -7334,17 +7307,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Загрузить текущие параметры на сервер" +msgstr "Загрузите с сервера список открытых вами пакетов изменений" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Удалить выделенные теги" +msgstr "Закрыть пакет изменений, выбранный в настоящий момент" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "обнаружено id > 0. Получено {0}" +msgstr "обнаружен идентификатор пакета изменений > 0. Получено {1}" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7548,10 +7519,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} дорожка, " -msgstr[1] "{0} дорожки, " -msgstr[2] "{0} дорожек, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7563,12 +7533,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Временной интервал: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Длина: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8948,7 +8916,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8973,7 +8941,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" +msgstr "" #. SAXException does not chain correctly @@ -9179,5 +9147,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Сбой при импорте NMEA!" @@ -9221,33 +9189,33 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 msgid "Creating changeset..." -msgstr "" +msgstr "Создание пакета изменений..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 #, java-format msgid "Successfully opened changeset {0}" -msgstr "" +msgstr "Успешно открытый пакет изменений {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "требуется параметр id ''{0}'' > 0. Получен {1}" +msgstr "требуется идентификатор пакета изменений > 0. Получено {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 msgid "Updating changeset..." -msgstr "" +msgstr "Обновление пакета изменений..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 #, java-format msgid "Updating changeset {0}..." -msgstr "" +msgstr "Обновление пакета изменений {0}..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." -msgstr "Закрывается список правок..." +msgstr "Закрытие пакета изменений..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 msgid "No changeset present for diff upload" -msgstr "Нет изменений для выгрузки" +msgstr "Нет пакетов изменений для загрузки отличий" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 @@ -9279,5 +9247,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 msgid "current changeset is null. Can't upload data." -msgstr "" +msgstr "текущий набор изменений пуст. Невозможно загрузить данные." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 @@ -9285,9 +9253,11 @@ msgid "id of current changeset > required. Current id is {0}" msgstr "" +"требуется идентификатор текущего пакета изменений > 0. Текущий идентификатор " +"{0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 -#, fuzzy, java-format +#, java-format msgid "Changeset id > 0 expected. Got {0}" -msgstr "обнаружено id > 0. Получено {0}" +msgstr "Требуемый дентификатор пакета изменений > 0. Получено {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 @@ -9295,4 +9265,6 @@ msgid "Open changeset expected. Got closed changeset with id {0}" msgstr "" +"Требуется открытый пакет изменений. Получен закрытый пакет изменений с " +"идентификатором {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -9319,7 +9291,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "обязательный атрибут ''{0}'' отсутствует" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9328,23 +9300,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" msgstr "" -"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " -"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" msgstr "" -"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " -"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" msgstr "" -"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " -"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9378,7 +9344,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Закрывается список правок..." +msgstr "Анализ списка пакетов изменений..." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9704,22 +9669,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Закрывается список правок..." +msgstr "Чтение пакетов изменений..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Закрывается список правок..." +msgstr "Скачка пакетов изменений ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Чтение {0}..." +msgstr "Чтение пакета изменений {0} ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Загрузка Плагина {0}..." +msgstr "Скачка пакета изменений {0} ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9760,7 +9723,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9768,9 +9731,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" msgstr "" -"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " -"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -10144,6 +10105,6 @@ "changeset will automatically be closed by the server after a timeout." msgstr "" -"Невозможно закрыть набор изменений ''{0}'' на сервере OSM ''{1}''." -"
Набор изменений будет автоматически закрыт сервером по истечении времени " +"Невозможно закрыть пакет изменений ''{0}'' на сервере OSM ''{1}''." +"
Пакет изменений будет автоматически закрыт сервером по истечении времени " "ожидания." @@ -11182,7 +11143,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Оставить их координаты" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11383,5 +11344,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "Импорт TangoGPS окончен ошибкой!" @@ -12118,24 +12079,21 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех " -"точек." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} точка" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Изменить точку {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} точка" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -12144,7 +12102,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Добавить линию {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -12153,12 +12111,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Версия {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Версия {0} дата создания: {1} автор: {2}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12176,9 +12134,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"Плагин openstreetbus использует старый сервер appspot.com.
Новый " +"Плагин openstreetbugs использует старый сервер appspot.com.
Новый " "сервер доступен на schokokeks.org.
Хотите переключится на новый сервер? " "(Строго рекомендуется)" @@ -13976,5 +13934,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -14276,5 +14234,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14475,7 +14433,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "дорога" +msgstr "" #. group "Highways" @@ -17110,7 +17067,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Общественный транспорт" +msgstr "" #. group "Transport" @@ -17929,7 +17885,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "гравий" +msgstr "" #. group "Travel" @@ -18552,13 +18507,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Границы" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Править книжный магазин" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19716,7 +19669,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Рукотворное" +msgstr "" #. group "Man-Made" @@ -21211,7 +21163,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "Географическая WGS84" +msgstr "" #. group "Places" @@ -26290,59 +26241,6 @@ msgstr "" -#~ msgid "Close current changeset" -#~ msgstr "Закрыть текущий пакет изменений" - -#~ msgid "There is currently no changeset open." -#~ msgstr "В данный момент нет открытого пакета изменений" - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "параметр ''{0}'' не может быть нулём" - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''" - -#~ msgid "- running version is {0}" -#~ msgstr "- сейчас запущена версия {0}" - -#~ msgid "not yet decided" -#~ msgstr "ещё не решено" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Использовать новый пакет изменений и закрыть его" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его " -#~ "открытым после загрузки." - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "" -#~ "Использовать текущий набор изменений {0} и закрыть его после загрузки" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to close the changeset " -#~ "after this upload" -#~ msgstr "" -#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть " -#~ "его после загрузки" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "Использовать текущий список изменений {0} и оставить открытым" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и оставить " -#~ "его открытым после загрузки" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не " -#~ "найдены." +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "параметр '{0}' не должен быть null" #~ msgid "Unknown file extension." @@ -26737,13 +26635,13 @@ #~ "загруженных элементов есть история." -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" -#~ "Страница справки отсутствует. Создайте её вenglish." +#~ "Страница справки отсутствует. Создайте её вEnglish." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Страница справки отсутствует. Создайте её в english " +#~ "Страница справки отсутствует. Создайте её в English " #~ "или вашем языке." @@ -26874,4 +26772,7 @@ #~ msgstr "виадук" +#~ msgid "- running version is {0}" +#~ msgstr "- сейчас запущена версия {0}" + #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Картинка {0} не существует или произошла ошибка чтения." @@ -26999,4 +26900,11 @@ #~ msgstr "Конфликт создан" +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не " +#~ "найдены." + #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Вы действительно хотите удалить слой ''{0}''?" @@ -27009,2 +26917,48 @@ #~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " #~ "Исключение в: {0}" + +#~ msgid "There is currently no changeset open." +#~ msgstr "В данный момент нет открытого пакета изменений" + +#~ msgid "Close current changeset" +#~ msgstr "Закрыть текущий пакет изменений" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Использовать новый пакет изменений и закрыть его" + +#~ msgid "" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" +#~ msgstr "" +#~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его " +#~ "открытым после загрузки." + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to leave the changeset " +#~ "open for further uploads" +#~ msgstr "" +#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и оставить " +#~ "его открытым после загрузки" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to close the changeset " +#~ "after this upload" +#~ msgstr "" +#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть " +#~ "его после загрузки" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "" +#~ "Использовать текущий набор изменений {0} и закрыть его после загрузки" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "Использовать текущий список изменений {0} и оставить открытым" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''" + +#~ msgid "not yet decided" +#~ msgstr "ещё не решено" + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "параметр ''{0}'' не может быть нулём" Index: applications/editors/josm/i18n/po/sk.po =================================================================== --- applications/editors/josm/i18n/po/sk.po (revision 17707) +++ applications/editors/josm/i18n/po/sk.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-18 03:51+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-20 06:46+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -151,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -193,5 +193,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -525,5 +525,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -656,13 +656,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Neotvárajte súbor zmien" +msgstr "Zatvoriť otvorený súbor zmien" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Neotvárajte súbor zmien" +msgstr "Zatvárajú sa otvorené súbory zmien" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -681,19 +679,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Neotvárajte súbor zmien" +msgstr "Niesú tam otvorené súbory zmien" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Neotvárajte súbor zmien" +msgstr "Neotvorené súbory zmien" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Zatváranie súboru zmien..." +msgstr "Sťahujem otvorené súbory zmien" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -767,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Vytvoriť kružnicu" @@ -775,9 +770,9 @@ msgstr "Vytvoriť kružnicu z troch vybratých bodov." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Tieto body niesú v kruhu. Prerušujem." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -790,5 +785,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -943,9 +938,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "paramenter ''{0}'' nesmie byť nulový" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' nesmie byť nulový" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -1006,15 +1079,15 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." -msgstr "" -"Chýbajúca stránka s pomocou. Vytvorte to v english." +msgid "Help page missing. Create it in English." +msgstr "" +"Chýbajúca stránka s pomocou. Vytvorte to v English." #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" -"Chýbajúca stránka s pomocou. Vytvorte to v english or " +"Chýbajúca stránka s pomocou. Vytvorte to v English or " "váš jazyk." @@ -1074,65 +1147,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' nesmie byť nulový" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1840,9 +1852,11 @@ "again with a new or an existing open changeset." msgstr "" +"Nahrávanie neúspešné pretože ste použili
súbor " +"zmien {0} ktorý už bol zavretý v {1}.
Prosím nahrať znova s novým, alebo " +"existujúcimi súbormi zmien." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Info súboru zmien" +msgstr "Zmenový súbor zavretý" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2256,7 +2270,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Zadajte hladaný reťazec." +msgstr "Prosím vložte vybraný reťazec" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2277,7 +2290,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "pridať k výberu" +msgstr "Hľadať vo výbere" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2400,5 +2412,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "Submit filter" -msgstr "" +msgstr "Predložiť filter" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 @@ -2422,7 +2434,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\"" +msgstr "Nič sa nenašlo vo výbere počes hľadania pre ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2454,5 +2466,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2460,10 +2472,10 @@ "použitia: kľúč=hodnota" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, 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:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2471,26 +2483,26 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "Neočakávaná značka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Chýbajúci argument pre \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Chýbajúci argument pre \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Očakávam uzatváraciu zátvorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 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:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2501,5 +2513,5 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2635,7 +2647,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, java-format -msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2651,5 +2663,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." @@ -2697,14 +2710,14 @@ msgstr[2] "Zmazať {0} relácií" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Konfliktné vzťahy (relation)" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Zmazať z relácie (zo vzťahu" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2715,5 +2728,5 @@ "relácie?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2723,5 +2736,5 @@ "Výber \"{0}\" je použitý reláciou \"{1}\".
Zmazať z relácie?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Rozdeliť segment cesty" @@ -2729,5 +2742,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2740,5 +2753,5 @@ "
Naozaj ich chcete zmazať?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "Odstrániť potvrdenie" @@ -2848,6 +2861,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Vyriešte konflikt v poradí bodov v ceste {0}" @@ -3079,5 +3092,5 @@ msgstr "Súbor zmien {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3086,41 +3099,37 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 msgid "H" -msgstr "" +msgstr "H" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "text" +msgstr "Text" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "C" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "I" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 msgid "M" -msgstr "" +msgstr "M" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "R" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 msgid "A" -msgstr "" +msgstr "A" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200 msgid "D" -msgstr "" +msgstr "D" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201 msgid "F" -msgstr "" +msgstr "F" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 @@ -3202,5 +3211,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" @@ -3876,4 +3885,6 @@ "this list with the mouse.
" msgstr "" +"Kliknutie stredného tlačítka myši opäť prejde cyklus.
podržanie CTRL pre " +"výber priamo z tohoto zoznamu s myšou.
" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 @@ -3882,7 +3893,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Užívateľ" +msgstr "Používateľ:" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4258,28 +4268,4 @@ msgstr[1] "Ich verzia ({0} vstup)" msgstr[2] "Ich verzia ({0} vstupov)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parameter '{0}' nesmie byť nulový" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4679,5 +4665,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Kľúč ''{0}'' a všetky jej hodnoty budú odstránené" @@ -4944,5 +4930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 msgid "Filter objects and hide/disable them." -msgstr "" +msgstr "Filtrovať objekty a schovať/vypnúť ich." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 @@ -4963,49 +4949,42 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Pridať vybrané" +msgstr "Pridať filter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Upraviť mólo" +msgstr "Upraviť filter." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Zmazať moje" +msgstr "Zmazať filter." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Posunúť vyššie" +msgstr "Posunúť filter hore." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Posunúť nižšie" +msgstr "Posunúť filter dole." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 msgid "Enable filter" -msgstr "" +msgstr "Zapnúť filter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Jednotlivé prvky" +msgstr "Schovať prvky" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 msgid "Apply also for children" -msgstr "" +msgstr "Uplatniť tiež pre deti(children)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Inverse filter" -msgstr "" +msgstr "Obrátený filter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "Režim filter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5282,9 +5261,9 @@ msgstr "Výber: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Uvoľniť panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5293,5 +5272,5 @@ "lište." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu" @@ -5430,10 +5409,10 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" "Je tam aspoň jeden člen odkazujúci na túto reláciu
na vlastnú " -"reláciu.
Táto vytvorená kruhová závislosť and is dicuraged.
Ako chcete " -"pokračovať s kruhovou závislosťou?" +"reláciu.
Táto vytvorená kruhová závislosť and is discouraged.
Ako " +"chcete pokračovať s kruhovou závislosťou?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 @@ -6924,17 +6903,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Info súboru zmien" +msgstr "Zmenový súbor id:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Vytvoriť plochy" +msgstr "Vytvorené v:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Info súboru zmien" +msgstr "Poznámka zmenového súbor:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6943,28 +6919,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť." +msgstr "Prosím vyberte zmenový súbor, ktorý chcete zavrieť" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Neotvárajte súbor zmien" +msgstr "Otvoriť zmenové súbory" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Zatváranie súboru zmien" +msgstr "Zatvoriť zmenové súbory" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Zatváram aktuálny súbor zmien ..." +msgstr "Zavrieť vybrané otvorené zmenové súbory" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Zatváranie súboru zmien" +msgid "Cancel closing of changesets" +msgstr "Zrušiť zatváranie zmenových súborov" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6973,7 +6944,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Zatváranie súboru zmien {0}..." +msgstr "zatváranie zmenového súboru {0}" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7001,21 +6972,21 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť nahraté" +msgstr "Vrstva ''{0}'' nemá žiadne zmeny na nahratie." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 -#, fuzzy, java-format +#, java-format msgid "" "Layer ''{0}'' has modifications which should be saved to its associated file " "''{1}''." msgstr "" -"Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté do ich pridruženého " +"Vrstva ''{0}'' má zmeny, ktoré môžu byť uložené do svojho pričleneného " "súboru ''{1}''." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť uložené" +msgstr "Vrstva ''{0}'' obsahuje zmeny pre uloženie." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 @@ -7319,7 +7290,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "nahrať všetky zmeny v jednej požiadavke" +msgstr "Nahrať všetky zmeny v jednej požiadavke" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7336,34 +7306,26 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "Značky pre nový súbor zmien" +msgstr "Otvoriť nový zmenový súbor" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 -#, fuzzy msgid "Open a new changeset and use it in the next upload" -msgstr "Použiť nový súbor zmien a nechať to otvoriť" +msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Neotvárajte súbor zmien" +msgstr "Použiť a otvoriť zmenový súbor" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 -#, fuzzy msgid "Upload data to an already opened changeset" -msgstr "Nahrať do nového, alebo existujúceho súboru zmien?" +msgstr "Nahrať dáta do už otvoreného zmenového súboru" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Žiadne zmeny pre uloženie." +msgstr "zatvoriť zmenový súbor po nahratí" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 -#, fuzzy msgid "Select to close the changeset after the next upload" -msgstr "" -"Výber pre nahrávanie dát použije nový súbor zmien a zatvorí súbor zmien po " -"nahratí" +msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 @@ -7376,17 +7338,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Načítať históriu zo serveru" +msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Vymazať aktuálne vybrané značky" +msgstr "Zatvoriť práve vybratý otvorený zmenový súbor" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "child.getId() >0 očakávaný. Got {1}" +msgstr "zmenový súbor id > 0 očekávaný. Got {1}" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7590,10 +7550,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} stopa(track), " -msgstr[1] "{0} stopy(track), " -msgstr[2] "{0} stôp(track), " +msgstr[0] "{0} stopa(track)" +msgstr[1] "{0} stopy(track)" +msgstr[2] "{0} stôp(track)" #. item "Relations/Route" text "Symbol description" @@ -7605,12 +7565,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Časové rozpätie: " +msgstr "Časový interval" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Dĺžka: " +msgstr "Dĺžka" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8176,5 +8134,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149 msgid "Draw a circle form HDOP value." -msgstr "" +msgstr "Kresliť kruh z HDOP hodnoty." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 @@ -8987,7 +8945,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\"" +msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -9012,7 +8970,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter ''{0}'' > 0 očakávaný, dostáva ''{1}''" +msgstr "parameter ''{0}'' > 0 očakávaný. Got {1}" #. SAXException does not chain correctly @@ -9221,5 +9179,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA import zlyhal!" @@ -9274,7 +9232,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}" +msgstr "id zo zmenového súboru > 0 požadovaný. Got {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9323,20 +9281,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 msgid "current changeset is null. Can't upload data." -msgstr "" +msgstr "aktuálny zmenový súbor je prázdny. Nemôžem nahrať dáta." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 #, java-format msgid "id of current changeset > required. Current id is {0}" -msgstr "" +msgstr "id z aktuálneho zmenového súboru > požadovaný. Aktuálne id je {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 -#, fuzzy, java-format +#, java-format msgid "Changeset id > 0 expected. Got {0}" -msgstr "id > 0 očakávané. Got {0}" +msgstr "Zmenový súbor id > 0 očekávaný. Got {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}" -msgstr "" +msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -9363,7 +9321,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "Chýba povinný atribút ''{0}''" +msgstr "chýbajúce povinné vlastnosti ''{0}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9372,17 +9330,17 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150 -#, fuzzy, java-format +#, java-format msgid "illegal value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" +msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 -#, fuzzy, java-format +#, java-format msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" +msgstr "chybné číselné hodnoty pre vlastnosti ''{0}''. Got ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 -#, fuzzy, java-format +#, java-format msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''" -msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" +msgstr "chybné booleovské hodnoty pre vlastnosti ''{0}''. Got ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9405,8 +9363,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176 -#, fuzzy, java-format +#, java-format msgid "Undefined element ''{0}'' found in input stream. Aborting." -msgstr "" -"Varovanie: Nedefinovaný element ''{0}'' hľadám vo vstupnom toku. Vynechanie." +msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Prerušujem." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 @@ -9417,7 +9374,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Zatváranie súboru zmien..." +msgstr "rozkladám obsah zo zmenového súboru..." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9634,8 +9590,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 -#, fuzzy, java-format +#, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." -msgstr "" -"Varovanie: Nedefinovaný element ''{0}'' hľadám vo vstupnom toku. Vynechanie." +msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 @@ -9761,22 +9716,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Vytváranie súboru zmien..." +msgstr "Načitávam zmenové súbory..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Zatváranie súboru zmien..." +msgstr "Sťahujem zmenové súbory..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Otváram povolený (leaving) súbor zmien {0}..." +msgstr "Načitávam zmenový súbor {0} ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Zatváranie súboru zmien {0}..." +msgstr "Sťahujem zmenový súbor {0} ..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9800,5 +9753,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 msgid "Error: failed to add authentication credentials to the connection." -msgstr "" +msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 @@ -9811,5 +9764,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48 msgid "XML tag is missing" -msgstr "" +msgstr "XML značka(tag) chýba" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53 @@ -9817,7 +9770,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Chýba povinná vlastnosť ''{0}'' z XML elementu {1}" +msgstr "Chýbajúca vlastnosť ''{0}'' na XML značke(tag) ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9825,7 +9778,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102 -#, fuzzy, java-format +#, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}" -msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" +msgstr "" +"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 @@ -11288,7 +11242,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Zvoliť Lambert súradnice" +msgstr "Zvoliť {0} Lambert súradnice" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11492,5 +11446,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "TangoGPS import neúspešný!" @@ -12218,52 +12172,52 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 msgid "Michigan Left" -msgstr "" +msgstr "Michigan Left" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 msgid "Adds no left turn for sets of 4 or 5 ways." -msgstr "" +msgstr "Pridť zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." +msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} bod" +msgstr "{0} hraničné(extrem) body." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 -#, fuzzy, java-format +#, java-format msgid "Via node {0}, {1}" -msgstr "Zmeniť {0} {1}" +msgstr "Sprostredkujúce(Via) body {0}, {1}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} bod" +msgstr "{0} Sprostredkujúce(via) body." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 msgid "Unable to find via nodes. Please check your selection" msgstr "" +"Nie som schopný nájsť sprostredkujúce body. Prosím skontrolujte váš výber." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Pridať cestu {0}" +msgstr "Stred(MIddle) cesty: {0}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 msgid "Create Michigan left turn restriction" -msgstr "" +msgstr "Vytvoriť Michigan zákaz odbočenia vľavo" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Verzia {0}" +msgstr "Spracovávanie {0}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "Verzia {0} vytvorená na {1} podľa {2}" +msgstr "Relácia: z {0} do {1} sprostredkujúca(via) {2}" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12281,9 +12235,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"Openstreetbus plugin používa starý server v appspot.com.
Nový " +"openstreetbugs plugin používa starý server v appspot.com.
Nový " "server je dostupný na schokokeks.org.
Chcete prejsť na nový server? " "(Veľmi odporúčame)" @@ -14080,10 +14034,10 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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?" msgstr "" -"Základ URL
''{0}''
pre túto WML vrstvu neobsahuje na konci " +"Základ URL
''{0}''
pre túto WMS vrstvu neobsahuje na konci " "žiadnu z ''&'' ani s ''?''.
Toto pravdepodobne vedie k chybnej WMS " "požiadavke. Mali by ste skontrolovať vaše
nastavenie preferencií." @@ -14376,10 +14330,10 @@ #: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" -msgstr "" +msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest" #. Plugin nearclick #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14583,7 +14537,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "komunikácie" +msgstr "Hlavná cesta" #. group "Highways" @@ -17225,7 +17178,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Hromadná doprava" +msgstr "Preprava" #. group "Transport" @@ -18045,7 +17997,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "štrk (gravel)" +msgstr "Cestovať" #. group "Travel" @@ -18668,13 +18619,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Hranice" +msgstr "Hraničné Kamene" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Upraviť kníhkupectvo" +msgstr "Upraviť Hraničné kamene" #. item "Historic Places/Boundary Stone" text "Name" @@ -19836,7 +19785,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Človekom vytvorené (Man made)" +msgstr "Človekom-Vytvorené (Man-Made)" #. group "Man-Made" @@ -21331,7 +21279,6 @@ #: build/trans_presets.java:2758 -#, fuzzy msgid "Geography" -msgstr "WGS84 Zemepisné" +msgstr "Zemepis" #. group "Places" @@ -26411,79 +26358,6 @@ msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Close current changeset" -#~ msgstr "Zavrieť aktuálny súbor zmien" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Teraz tam nie je otvorený súbor zmien." - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "parameter''{0}'' nesmie byť nula" - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''" - -#~ msgid "- running version is {0}" -#~ msgstr "- teraz používaná verzia je {0}" - -#~ msgid "not yet decided" -#~ msgstr "ešte žiadne rozhodnutie" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Použite nový súbor zmien a zatvorte ho" - -#~ 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í" - -#~ 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í" - -#~ 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í" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený" - -#~ 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" - -#~ msgid "Changeset {0} is unchanged. Skipping update." -#~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu." - -#~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the " -#~ "id of the current changeset is 0" -#~ msgstr "" -#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor " -#~ "zmien, alebo id aktuálneho súboru zmien je 0" - -#~ msgid "Set " -#~ msgstr "Nastavenie(Set) " - -#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" -#~ msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds" - -#~ msgid "" -#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" -#~ msgstr "" -#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main." -#~ "getCurrentDataSet()" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "Nečakaná verzia JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found." +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter '{0}' nesmie byť nulový" #~ msgid "Move" @@ -26943,13 +26817,16 @@ #~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu." -#~ msgid "Helppage missing. Create it in english." +#~ msgid "- running version is {0}" +#~ msgstr "- teraz používaná verzia je {0}" + +#~ msgid "Helppage missing. Create it in English." #~ msgstr "" -#~ "Stránka s nápovedou chýba. Vytvorte to v english." +#~ "Stránka s nápovedou chýba. Vytvorte to v English." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" -#~ "Stránka s nápovedou chýba. Vytvorte to v english " +#~ "Stránka s nápovedou chýba. Vytvorte to v English " #~ "alebo váš jazyk." @@ -27181,4 +27058,19 @@ #~ "bola: {0}" +#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +#~ msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "Nečakaná verzia JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found." + +#~ msgid "" +#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +#~ msgstr "" +#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main." +#~ "getCurrentDataSet()" + #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " @@ -27259,4 +27151,43 @@ #~ "limitu servera. Výnimka bola: {1}" +#~ msgid "There is currently no changeset open." +#~ msgstr "Teraz tam nie je otvorený súbor zmien." + +#~ msgid "Close current changeset" +#~ msgstr "Zavrieť aktuálny súbor zmien" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "Použite nový súbor zmien a zatvorte ho" + +#~ 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í" + +#~ 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" + +#~ 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í" + +#~ 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í" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený" + +#~ msgid "Changeset {0} is unchanged. Skipping update." +#~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu." + #~ msgid "No currently open changeset. Opening a new changeset..." #~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..." @@ -27271,2 +27202,21 @@ #~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol " #~ "požadovaný. Otvátam nový.." + +#~ msgid "" +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" +#~ msgstr "" +#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor " +#~ "zmien, alebo id aktuálneho súboru zmien je 0" + +#~ msgid "not yet decided" +#~ msgstr "ešte žiadne rozhodnutie" + +#~ msgid "Set " +#~ msgstr "Nastavenie(Set) " + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "parameter''{0}'' nesmie byť nula" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''" Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 17707) +++ applications/editors/josm/i18n/po/sl.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 04:21+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:17+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "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-19 10:42+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -190,5 +190,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -638,13 +638,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -668,13 +666,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Sprejemanje podatkov OSM..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -745,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Ustvari krog" @@ -753,9 +749,9 @@ msgstr "Skozi izbrana tri vozlišča ustvari krog" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -766,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -919,9 +915,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' ne sme biti ničen" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -982,5 +1056,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "" @@ -988,5 +1062,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1047,65 +1121,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' ne sme biti ničen" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1775,7 +1788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2173,7 +2185,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Prosim, vnesite iskalni izraz." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2194,7 +2205,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "dodaj v izbor" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2332,7 +2342,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2361,40 +2371,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2403,5 +2413,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2538,5 +2548,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2550,5 +2560,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2592,14 +2603,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2608,5 +2619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2615,5 +2626,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "" @@ -2621,5 +2632,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2629,5 +2640,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2734,5 +2745,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2942,5 +2953,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2952,7 +2963,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "besedilo" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3060,5 +3070,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3724,7 +3734,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Uporabniško ime" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4076,28 +4085,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "parameter '{0}' ne sme biti ničen" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4482,5 +4467,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4753,27 +4738,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Dodaj izbrano" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Uredi pomol" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Izberite bodisi:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Premakni navzgor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Premakni navzdol" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4782,7 +4762,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Posamezen element" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4795,7 +4774,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Način za brisanje" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5074,14 +5052,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5214,5 +5192,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6677,17 +6655,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Ustvari površine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Spremeni relacijo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6696,26 +6671,22 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "paketi sprememb" +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Izbriši izbrane predmete." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -msgid "Cancel closeing of changesets" +msgid "Cancel closing of changesets" msgstr "" @@ -6725,7 +6696,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Zadnja sprememba {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7037,7 +7008,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Pošlji vse spremembe na strežnik OSM." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7052,7 +7022,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7061,7 +7030,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Neshranjene spremembe" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7070,7 +7038,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Ni sprememb za pošiljanje." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7087,12 +7054,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Prenos trenutnih nastavitev na strežnik" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Pomakni izbranega člana vrstico višje." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7302,11 +7267,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "sledi" -msgstr[1] "sled" -msgstr[2] "sledi" -msgstr[3] "sledi" +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7322,7 +7285,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Dolžina poti" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8633,7 +8595,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8658,7 +8620,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter ''{0}'' ne sme biti ničen" +msgstr "" #. SAXException does not chain correctly @@ -8862,5 +8824,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "" @@ -9359,22 +9321,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "paketi sprememb" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Sprejemanje..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Berem {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Sprejem točk od {0} do {1}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9415,7 +9375,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10963,5 +10923,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11683,12 +11643,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} točk" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11698,7 +11657,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} točk" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11707,7 +11666,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Način: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11716,7 +11675,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Različica {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11739,5 +11698,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13454,5 +13413,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13725,5 +13684,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13899,7 +13858,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "cesta" +msgstr "" #. group "Highways" @@ -16534,7 +16492,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Javni prevoz" +msgstr "" #. group "Transport" @@ -17353,7 +17310,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Shrani" +msgstr "" #. group "Travel" @@ -17976,13 +17932,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Meje" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Uredu avtobusno postajališče" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -25712,4 +25666,7 @@ msgstr "" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter '{0}' ne sme biti ničen" + #~ msgid "Move" #~ msgstr "Premakni" Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 17707) +++ applications/editors/josm/i18n/po/sv.po (revision 17708) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" "PO-Revision-Date: 2009-09-15 02:22+0000\n" "Last-Translator: Mattias Dalkvist \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:40+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -191,5 +191,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -518,5 +518,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -650,13 +650,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -675,19 +673,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Servern har inte stöd för ändringssamlingar" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -763,5 +758,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Skapa cirkel" @@ -771,9 +766,9 @@ msgstr "Skapa en cirkel av tre valda noder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Noderna är inte i en cirkel. Avbryter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -786,5 +781,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -940,8 +935,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parametern ''{0}'' får inte vara null" @@ -1003,5 +1076,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." +msgid "Help page missing. Create it in English." msgstr "Hjälpsida saknas. Skapa den på engelska." @@ -1009,5 +1082,5 @@ #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" @@ -1070,65 +1143,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1822,7 +1834,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Ändra värden?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2232,7 +2243,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Ange en söksträng." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2253,7 +2263,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "utöka urval" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2399,7 +2408,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Urvalet utökades inte genom att söka efter ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2432,40 +2441,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "En avslutande parentes förväntades" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2474,5 +2483,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2607,5 +2616,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2619,5 +2628,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " @@ -2663,14 +2673,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "Relationskonflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "Ta bort från relation" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2679,5 +2689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2686,5 +2696,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Dela delsträcka" @@ -2692,5 +2702,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2703,5 +2713,5 @@ "använder dem.
Vill du verkligen ta bort dem?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2807,6 +2817,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "Lös konflikter i nodlistan för väg {0}" @@ -3018,5 +3028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -3028,12 +3038,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "text" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "WC" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -3046,7 +3054,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3138,5 +3145,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3805,7 +3812,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Användare" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4157,28 +4163,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4565,5 +4547,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4837,27 +4819,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Lägg till vald" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Redigera pir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Radera mina" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Flytta uppåt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Flytta nedåt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4866,7 +4843,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Enstaka poster" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4879,7 +4855,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Filter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5154,9 +5129,9 @@ msgstr "Urval: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Lossa panelen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5165,5 +5140,5 @@ "vänstra verktygraden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "Klicka för att minimera/maximera panelens innehåll" @@ -5296,5 +5271,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6760,17 +6735,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "Ändra relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Skapa ytor" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Bidragskommentar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6779,28 +6751,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "Välj vilka ändringar av egenskaper som du vill genomföra." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Stänger ändringssamling..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Ta bort valda objekt." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Stänger ändringssamling..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6809,7 +6776,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7121,7 +7088,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Skicka in alla ändringar till OSM-servern." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7144,7 +7110,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Osparade ändringar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7153,7 +7118,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Det finns inte några ändringar att skicka in." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7170,17 +7134,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Skicka in inställningar till servern" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Flytta vald medlem/valda medlemmar uppåt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7383,9 +7345,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} spår, " -msgstr[1] "{0} spår, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7397,12 +7359,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Tidsomfång: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Längd: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8768,7 +8728,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8793,7 +8753,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #. SAXException does not chain correctly @@ -8997,5 +8957,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "Import från NMEA misslyckades!" @@ -9044,7 +9004,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -9186,7 +9146,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9496,22 +9455,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "Läser {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Stänger ändringssamling..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9551,7 +9508,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10950,7 +10907,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Nollkoordinater: " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -11145,5 +11102,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11878,12 +11835,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} nod" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11893,7 +11849,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} nod" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11902,7 +11858,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Läge: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11911,7 +11867,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Version {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11934,5 +11890,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13700,5 +13656,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13976,5 +13932,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -14150,7 +14106,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "landsväg" +msgstr "" #. group "Highways" @@ -16785,7 +16740,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Kollektivtrafik" +msgstr "" #. group "Transport" @@ -17604,7 +17558,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "grus" +msgstr "" #. group "Travel" @@ -18227,13 +18180,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Gränser" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "Redigera en busshållplats" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19391,7 +19342,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "Byggnadsverk" +msgstr "" #. group "Man-Made" @@ -25963,7 +25913,4 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" - -#~ msgid "- running version is {0}" -#~ msgstr "- nuvarande version är {0}" #~ msgid "Move" @@ -26418,4 +26365,7 @@ #~ msgstr "Följande fel uppstod vid massnedladdning:" +#~ msgid "- running version is {0}" +#~ msgstr "- nuvarande version är {0}" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -26438,9 +26388,9 @@ #~ "Skicka inte in några data efter du har fått detta meddelande." -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjälpsida saknas. Skapa den på engelska." #~ msgid "" -#~ "Helppage missing. Create it in english or English or your language." #~ msgstr "" Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 17707) +++ applications/editors/josm/i18n/po/tr.po (revision 17708) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 05:27+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:34+0000\n" "Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -191,5 +191,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -514,5 +514,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -639,13 +639,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -664,19 +662,16 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 -#, fuzzy msgid "There are no open changesets" -msgstr "Bu bu bilgiyi desteklemiyor." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -751,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "Daire Oluştur" @@ -759,9 +754,9 @@ msgstr "Seçili üç noktadan daire oluştur." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "Bu noktalar daire şeklinde değiller. Vazgeçtik." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -774,5 +769,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -927,8 +922,86 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" msgstr "parametre ''{0}'' zero (null) olamaz" @@ -990,14 +1063,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." -msgstr "Yardım sayfası yok. english olarak oluştur." +msgid "Help page missing. Create it in English." +msgstr "Yardım sayfası yok. English olarak oluştur." #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" -"Yardım sayfası yok. english ya da English ya da türkçe olarak oluştur." @@ -1057,65 +1130,4 @@ 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:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1785,7 +1797,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "Değerleri Değiştir?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2188,7 +2199,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "Lütfen bir aramametni giriniz." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2209,7 +2219,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "seçime ekleyiniz" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2347,7 +2356,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2379,40 +2388,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "or için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "not için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "Parantezlerin kapanması beklenir." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2421,5 +2430,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2553,5 +2562,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2565,5 +2574,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2607,14 +2617,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "İlişkilerde Karışıklık" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2623,5 +2633,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2630,5 +2640,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "Yol segmentini ayrıştır" @@ -2636,5 +2646,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2646,5 +2656,5 @@ "objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2751,5 +2761,5 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format -msgid "Resolve conflicts in node list of of way {0}" +msgid "Resolve conflicts in node list of way {0}" msgstr "" @@ -2961,5 +2971,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2971,17 +2981,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "metin" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -2990,7 +2997,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3082,5 +3088,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3740,7 +3746,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "Kullanıcı" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4092,28 +4097,4 @@ msgstr[0] "" msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4498,5 +4479,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4767,27 +4748,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "Seçileni Ekle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "Kemer Düzenle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "Şunların Arasında Seçiniz:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "Yukarı Git" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "Aşağı" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4796,7 +4772,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "Tek Eleman" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4809,7 +4784,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "Silme Modu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5082,14 +5056,14 @@ msgstr "Seçim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "Panelin kilidini Kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "paneli büyütüp/küçültmek için tıklayınız" @@ -5222,5 +5196,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6683,17 +6657,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "İlişkiyi değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "Alanları Oluştur" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "Açıklamayı Kabul Ediniz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6702,28 +6673,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "Kapanıyor..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "Seçili Objeleri Sil." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "Kapanıyor..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6732,7 +6698,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7044,7 +7010,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "Bütün değişiklikleri OSM server'ına yükle." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7067,7 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "Kaydedilmemiş Değişiklikler" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7076,7 +7040,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "Yüklenilecek değişiklik yok." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7093,12 +7056,10 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "Tercihleri server'a yükleyiniz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "Seçili üyeyi yukarı taşı" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 @@ -7305,8 +7266,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} iz, " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7318,12 +7280,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#, fuzzy msgid "Timespan" -msgstr "Zaman_aralığı: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "Uzunluk: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8639,7 +8599,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "''{1}'' gurubu için ''{0}'' kullan" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8664,7 +8624,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "parametre ''{0}'' zero (null) olamaz" +msgstr "" #. SAXException does not chain correctly @@ -8868,5 +8828,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA içeri alınmasında hata!" @@ -9057,7 +9017,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9366,22 +9325,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "{0} Okunuyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "Kapanıyor..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9422,7 +9379,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "''{1}'' gurubu için ''{0}'' kullan" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10794,7 +10751,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "Sıfır koordinatlar: " +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10986,5 +10943,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "" @@ -11715,12 +11672,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "Lütfen birleştirmek için en az iki yol seçiniz." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} Kavşak" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11730,7 +11686,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} Kavşak" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11739,7 +11695,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "Mode: {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11748,7 +11704,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "Sürüm {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -11771,5 +11727,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" @@ -13507,5 +13463,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13784,5 +13740,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13958,7 +13914,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "Karayolu" +msgstr "" #. group "Highways" @@ -16593,7 +16548,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "Toplu taşıma" +msgstr "" #. group "Transport" @@ -17412,7 +17366,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "Çakıl" +msgstr "" #. group "Travel" @@ -18035,13 +17988,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "Belediye Sınırı" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "otobüs durağı düzenle" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19199,7 +19150,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "İnsan Yapımı" +msgstr "" #. group "Man-Made" Index: applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- applications/editors/josm/i18n/po/zh_TW.po (revision 17707) +++ applications/editors/josm/i18n/po/zh_TW.po (revision 17708) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-19 13:00+0200\n" -"PO-Revision-Date: 2009-09-15 03:31+0000\n" +"POT-Creation-Date: 2009-09-20 11:11+0200\n" +"PO-Revision-Date: 2009-09-19 12:05+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n" +"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -190,5 +190,5 @@ #: ../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/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 @@ -513,5 +513,5 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -638,13 +638,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 -#, fuzzy msgid "Close open changesets" -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 -#, fuzzy msgid "Closes open changesets" -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -668,13 +666,11 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 -#, fuzzy msgid "No open changesets" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 -#, fuzzy msgid "Downloading open changesets ..." -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 @@ -745,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 msgid "Create Circle" msgstr "建立圓形" @@ -753,9 +749,9 @@ msgstr "從三個選取的節點建立圓形。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 msgid "Those nodes are not in a circle. Aborting." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -766,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 @@ -919,9 +915,87 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../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/DataSet.java:395 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 +#: ../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/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 +#: ../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/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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#, java-format -msgid "paramenter ''{0}'' must not be null" -msgstr "參數「{0}」不能為空值(null)" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "參數「{0}」必須不為空值(null)" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 @@ -982,14 +1056,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format -msgid "Help page missing. Create it in english." -msgstr "求助頁面遺失。以 english 建立它。" +msgid "Help page missing. Create it in English." +msgstr "求助頁面遺失。以 English 建立它。" #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" -"Help page missing. Create it in english or English or your language." msgstr "" -"求助頁面遺失。以 english 或 您的語言" +"求助頁面遺失。以 English 或 您的語言" "建立它。" @@ -1049,65 +1123,4 @@ msgid "Please select at least two nodes to merge." msgstr "請至少選取兩個節點來合併" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 -#: ../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/DataSet.java:394 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 -#: ../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/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:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 -#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 -#, java-format -msgid "parameter ''{0}'' must not be null" -msgstr "參數「{0}」必須不為空值(null)" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 @@ -1771,7 +1784,6 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#, fuzzy msgid "Changeset closed" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336 @@ -2170,7 +2182,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 -#, fuzzy msgid "Please enter a filter string." -msgstr "請輸入搜尋字串。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2191,7 +2202,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 -#, fuzzy msgid "find in selection" -msgstr "加入至選擇區域" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2333,7 +2343,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, fuzzy, java-format +#, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2365,40 +2375,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 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:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512 #, java-format msgid "Unexpected token: {0}" msgstr "未預期的記號：{0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 msgid "Missing arguments for or." msgstr "沒有 or 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542 msgid "Missing argument for not." msgstr "沒有 not 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552 msgid "Expected closing parenthesis." msgstr "需要關閉括弧。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 msgid "Wrong number of parameters for nodes operator." msgstr "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616 #, java-format msgid "" @@ -2409,5 +2419,5 @@ "nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2541,5 +2551,5 @@ #, java-format msgid "" -"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitmive ''{1}''" msgstr "" @@ -2553,5 +2563,6 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2595,14 +2606,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 msgid "Conflicting relation" msgstr "衝突的關係" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 msgid "Delete from relation" msgstr "自關係中刪除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 #, java-format msgid "" @@ -2611,5 +2622,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 #, java-format msgid "" @@ -2618,5 +2629,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449 msgid "Split way segment" msgstr "分割路徑區段" @@ -2624,5 +2635,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" @@ -2634,5 +2645,5 @@ "看到的）可能會使用它們。
確定要刪除嗎？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481 msgid "Delete confirmation" msgstr "" @@ -2738,6 +2749,6 @@ #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" +#, fuzzy, java-format +msgid "Resolve conflicts in node list of way {0}" msgstr "解決路徑 {0} 的節點清單衝突" @@ -2949,5 +2960,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2959,17 +2970,14 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "Text" -msgstr "文字" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "C" -msgstr "CS" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 -#, fuzzy msgid "I" -msgstr "CI" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 @@ -2978,7 +2986,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198 -#, fuzzy msgid "R" -msgstr "RX" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199 @@ -3070,5 +3077,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 -msgid "Didn't find an primitive with id {0} in this dataset" +msgid "Didn't find an primitive with id {0} in this dataset" msgstr "" @@ -3730,7 +3737,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 -#, fuzzy msgid "User:" -msgstr "使用者" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4079,28 +4085,4 @@ msgid_plural "Their version ({0} entries)" msgstr[0] "他們的版本 ({0} 個項目)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../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:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -msgid "parameter '{0}' must not be null" -msgstr "參數「{0}」不能為空值(null)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 @@ -4487,5 +4469,5 @@ #: ../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" +msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" @@ -4756,27 +4738,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#, fuzzy msgid "Add filter." -msgstr "加入選取的" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#, fuzzy msgid "Edit filter." -msgstr "編輯渡頭" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#, fuzzy msgid "Delete filter." -msgstr "刪除圖層" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 -#, fuzzy msgid "Move filter up." -msgstr "上移" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 -#, fuzzy msgid "Move filter down." -msgstr "下移(_D" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 @@ -4785,7 +4762,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 -#, fuzzy msgid "Hide elements" -msgstr "單一元件" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 @@ -4798,7 +4774,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 -#, fuzzy msgid "Filter mode" -msgstr "過濾條件" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5071,14 +5046,14 @@ msgstr "選擇區域：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 msgid "Undock the panel" msgstr "解鎖面板" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 msgid "Click to minimize/maximize the panel content" msgstr "點選以最小化/最大化面板內容" @@ -5211,5 +5186,5 @@ msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is dicuraged." +"relation itself.
This creates circular dependencies and is discouraged." "
How do you want to proceed with circular dependencies?" msgstr "" @@ -6672,17 +6647,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 -#, fuzzy msgid "Changeset id:" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 -#, fuzzy msgid "Created at:" -msgstr "建立區域" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 -#, fuzzy msgid "Changeset comment:" -msgstr "改變關係" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6691,28 +6663,23 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 -#, fuzzy msgid "Please select the changesets you want to close" -msgstr "請選擇要接受的屬性變更。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 -#, fuzzy msgid "Open changesets" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 -#, fuzzy msgid "Close changesets" -msgstr "正在關閉資料組合..." +msgstr "" #. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 -#, fuzzy msgid "Close the selected open changesets" -msgstr "刪除選擇的物件" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 -#, fuzzy -msgid "Cancel closeing of changesets" -msgstr "正在關閉資料組合..." +msgid "Cancel closing of changesets" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6721,7 +6688,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 -#, fuzzy, java-format +#, java-format msgid "Closing changeset {0}" -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -7033,7 +7000,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 -#, fuzzy msgid "Upload all changes in one request" -msgstr "將所有的變更上傳至 OSM 伺服器。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7048,7 +7014,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 -#, fuzzy msgid "Open a new changeset" -msgstr "變更組合" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673 @@ -7057,7 +7022,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680 -#, fuzzy msgid "Use an open changeset" -msgstr "未儲存的變更" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681 @@ -7066,7 +7030,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721 -#, fuzzy msgid "Close changeset after upload" -msgstr "沒有要上傳的變更。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 @@ -7083,17 +7046,15 @@ #. putValue(NAME, tr("Reload")); #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 -#, fuzzy msgid "Load the list of your open changesets from the server" -msgstr "將目前的偏好設定上傳到伺服器" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 -#, fuzzy msgid "Close the currently selected open changeset" -msgstr "將目前選取的成員上移" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 -#, fuzzy, java-format +#, java-format msgid "changeset id > 0 expected. Got {1}" -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 @@ -7295,8 +7256,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349 -#, fuzzy, java-format +#, java-format msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "{0} 軌跡， " +msgstr[0] "" +msgstr[1] "" #. item "Relations/Route" text "Symbol description" @@ -7312,7 +7274,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 -#, fuzzy msgid "Length" -msgstr "長度： " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -8611,7 +8572,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, fuzzy, java-format +#, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "使用群組「{1}」的預設組合「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8636,7 +8597,7 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' > 0 expected. Got {1}" -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #. SAXException does not chain correctly @@ -8838,5 +8799,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 -msgid "NMEA import faliure!" +msgid "NMEA import failure!" msgstr "NMEA 匯入失敗！" @@ -8885,7 +8846,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#, fuzzy, java-format +#, java-format msgid "id of changeset > 0 required. Got {0}" -msgstr "參數 {0} 必須 > 0 。得到 {1}。" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 @@ -8974,7 +8935,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109 -#, fuzzy, java-format +#, java-format msgid "missing mandatory attribute ''{0}''" -msgstr "缺少必要的屬性「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78 @@ -9027,7 +8988,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 -#, fuzzy msgid "Parsing list of changesets..." -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9338,22 +9298,20 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 -#, fuzzy msgid "Reading changesets..." -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 -#, fuzzy msgid "Downloading changesets ..." -msgstr "正在關閉資料組合..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 -#, fuzzy, java-format +#, java-format msgid "Reading changeset {0} ..." -msgstr "正在讀取 {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 -#, fuzzy, java-format +#, java-format msgid "Downloading changeset {0} ..." -msgstr "正在下載外掛程式 {0}..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9392,7 +9350,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97 -#, fuzzy, java-format +#, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''" -msgstr "使用群組「{1}」的預設組合「{0}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -10760,7 +10718,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy, java-format +#, java-format msgid "Set {0} Lambert coordinates" -msgstr "保留他們的坐標" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10960,5 +10918,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 -msgid "TangoGPS import faliure!" +msgid "TangoGPS import failure!" msgstr "TangoGPS 匯入失敗！" @@ -11684,12 +11642,11 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 -#, fuzzy msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "請選擇一或多個至少有四個節點的封閉路徑。" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 -#, fuzzy, java-format +#, java-format msgid "{0} extrem nodes." -msgstr "{0} 節點" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 @@ -11699,7 +11656,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 -#, fuzzy, java-format +#, java-format msgid "{0} via nodes." -msgstr "{0} 節點" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 @@ -11708,7 +11665,7 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 -#, fuzzy, java-format +#, java-format msgid "MIddle way: {0}" -msgstr "模式：{0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 @@ -11717,12 +11674,12 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 -#, fuzzy, java-format +#, java-format msgid "Processing {0}" -msgstr "版本 {0}" +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 -#, fuzzy, java-format +#, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "版本 {0} 由 {2} 建立於 {1}" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -11740,9 +11697,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" -"The openstreetbus plugin is using the old server at appspot.com.
A " +"The openstreetbugs plugin is using the old server at appspot.com.
A " "new server is available at schokokeks.org.
Do you want to switch to the " "new server? (Strongly recommended)" msgstr "" -"openstreetbus 外掛程式用的是在 appspot.com 的舊伺服器。
新的伺服器" +"openstreetbugs 外掛程式用的是在 appspot.com 的舊伺服器。
新的伺服器" "在 schokokeks.org。
是否要切換至新的伺服器？（強烈建議）" @@ -13492,5 +13449,5 @@ #, java-format msgid "" -"The base URL
''{0}''
for this WML layer does neither end with a " +"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 " @@ -13776,5 +13733,5 @@ #: build/trans_plugins.java:37 msgid "" -"Simulates a click when you do a small and short drag. This is usefull for " +"Simulates a click when you do a small and short drag. This is useful for " "tablet pens, when you have problems just clicking the tablet without the " "mouse moving (general Java - tablet problem)." @@ -13959,7 +13916,6 @@ #. #: build/trans_presets.java:57 -#, fuzzy msgid "Highways" -msgstr "公路" +msgstr "" #. group "Highways" @@ -16594,7 +16550,6 @@ #. item "Waterway Point/Slipway" text "Name" #: build/trans_presets.java:1250 -#, fuzzy msgid "Transport" -msgstr "大眾運輸" +msgstr "" #. group "Transport" @@ -17413,7 +17368,6 @@ #. #: build/trans_presets.java:1567 -#, fuzzy msgid "Travel" -msgstr "碎石路" +msgstr "" #. group "Travel" @@ -18036,13 +17990,11 @@ #. item "Historic Places/Wayside Shrine" text "Name" #: build/trans_presets.java:1852 -#, fuzzy msgid "Boundary Stone" -msgstr "邊界" +msgstr "" #. item #: build/trans_presets.java:1853 -#, fuzzy msgid "Edit Boundary Stone" -msgstr "編輯公車站牌" +msgstr "" #. item "Historic Places/Boundary Stone" text "Name" @@ -19200,7 +19152,6 @@ #: build/trans_presets.java:2141 -#, fuzzy msgid "Man-Made" -msgstr "人造物" +msgstr "" #. group "Man-Made" @@ -25773,6 +25724,6 @@ msgstr "" -#~ msgid "- running version is {0}" -#~ msgstr "- 執行的版本是 {0}" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "參數「{0}」不能為空值(null)" #~ msgid "unnamed" @@ -25874,4 +25825,7 @@ #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "不能開啓偏好設定目錄：{0}" + +#~ msgid "- running version is {0}" +#~ msgstr "- 執行的版本是 {0}" #~ msgid "Apply partial resolutions"